summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-05-21 15:38:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-21 15:38:26 +0000
commit9472cadd2219fbe956ea6ba32853efc12abbf69f (patch)
tree29f4e22b92e0af80e2425c40c3aadb48952f1acf /api
parentc28716964c4525bf9a291404d7f14e74de23f36f (diff)
parentef2b35cc2e87058ead622bd1858d358690c201fd (diff)
downloadframeworks_base-9472cadd2219fbe956ea6ba32853efc12abbf69f.zip
frameworks_base-9472cadd2219fbe956ea6ba32853efc12abbf69f.tar.gz
frameworks_base-9472cadd2219fbe956ea6ba32853efc12abbf69f.tar.bz2
am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ef2b35cc2e87058ead622bd1858d358690c201fd': Import translations. DO NOT MERGE
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions