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