summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 18:39:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 18:39:43 +0000
commit701449e85395d7a81d244d4b115b9ef4ae2f06d9 (patch)
tree693a938d06c7cc9157dab1d9bc88ca7dc243905d
parent50d0afa43af2b215ddddbc7a3adfb8b5d85cb549 (diff)
parentc9443fc54caa789c4e3c64e7d9feaee8ac00506f (diff)
downloadframeworks_base-701449e85395d7a81d244d4b115b9ef4ae2f06d9.zip
frameworks_base-701449e85395d7a81d244d4b115b9ef4ae2f06d9.tar.gz
frameworks_base-701449e85395d7a81d244d4b115b9ef4ae2f06d9.tar.bz2
am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions