summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-11-20 13:20:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-20 13:20:44 -0800
commit68c5e7a83deeed7421f4c67773f807a66113a5bf (patch)
treed0e8f507c79f393a2919d5d7712fe0f31e273477 /graphics/java/android
parent89be9b5265b88b29e37bb66cdc571878327d9724 (diff)
parentb6c3d5b4ac9300fdb2902509ff485feadcae9553 (diff)
downloadframeworks_base-68c5e7a83deeed7421f4c67773f807a66113a5bf.zip
frameworks_base-68c5e7a83deeed7421f4c67773f807a66113a5bf.tar.gz
frameworks_base-68c5e7a83deeed7421f4c67773f807a66113a5bf.tar.bz2
am b6c3d5b4: (-s ours) am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b6c3d5b4ac9300fdb2902509ff485feadcae9553': Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android')
0 files changed, 0 insertions, 0 deletions