summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-09-21 18:22:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-21 18:22:51 +0000
commit1716e116c83d0fe1c8bcfda83511102edbb3517e (patch)
tree96bd4211a37ff79ab2817d4f091def8eafb74001 /cmds
parentf24825e716289a50a9778f28f03824e10c770686 (diff)
parentff2e858fe74e710a92c887d2c36d3640d8e8a4c2 (diff)
downloadframeworks_base-1716e116c83d0fe1c8bcfda83511102edbb3517e.zip
frameworks_base-1716e116c83d0fe1c8bcfda83511102edbb3517e.tar.gz
frameworks_base-1716e116c83d0fe1c8bcfda83511102edbb3517e.tar.bz2
am bfba545c: (-s ours) am 8c86f1cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'bfba545cc84e67ae0da14427471b3b7b732b0a73': Import translations. DO NOT MERGE
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions