summaryrefslogtreecommitdiffstats
path: root/native/android
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-12 21:19:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 21:19:09 -0800
commit420edea97ee6b12f02abfa70cfad2b41368a70f5 (patch)
treebd32a56172327ac089568f24fa3f78d01577a35b /native/android
parentbc20b8c321f11471ae97a6e7dade3a04e10a9e7a (diff)
parent35fbb9f9e59795e233fb59cb5a87573e4669aebd (diff)
downloadframeworks_base-420edea97ee6b12f02abfa70cfad2b41368a70f5.zip
frameworks_base-420edea97ee6b12f02abfa70cfad2b41368a70f5.tar.gz
frameworks_base-420edea97ee6b12f02abfa70cfad2b41368a70f5.tar.bz2
am 35fbb9f9: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '35fbb9f9e59795e233fb59cb5a87573e4669aebd': Import translations. DO NOT MERGE
Diffstat (limited to 'native/android')
0 files changed, 0 insertions, 0 deletions