diff options
author | Baligh Uddin <baligh@google.com> | 2014-02-12 21:19:09 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-12 21:19:09 -0800 |
commit | 420edea97ee6b12f02abfa70cfad2b41368a70f5 (patch) | |
tree | bd32a56172327ac089568f24fa3f78d01577a35b /native/android | |
parent | bc20b8c321f11471ae97a6e7dade3a04e10a9e7a (diff) | |
parent | 35fbb9f9e59795e233fb59cb5a87573e4669aebd (diff) | |
download | frameworks_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