summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-20 23:57:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 23:57:33 +0000
commit60ea57cc1b72b5938e7b37209958ad27db9db209 (patch)
tree1d79d3d28b7f88d7d0ff87e465a1acb207a250e3 /libs/androidfw
parent30ef14e8a51341f099d4cec2dbe6f185578ded33 (diff)
parent0359259318d8981b52d4ef674cd56f68c10f3507 (diff)
downloadframeworks_base-60ea57cc1b72b5938e7b37209958ad27db9db209.zip
frameworks_base-60ea57cc1b72b5938e7b37209958ad27db9db209.tar.gz
frameworks_base-60ea57cc1b72b5938e7b37209958ad27db9db209.tar.bz2
am 03592593: (-s ours) am a9a550dd: (-s ours) am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '0359259318d8981b52d4ef674cd56f68c10f3507': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw')
0 files changed, 0 insertions, 0 deletions