| commit | 92ef7bc902c72060823fd8da53c718f7f8d0b66d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Aug 25 22:23:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 22:23:52 2014 +0000 |
| tree | 13ee4d2fe9b60bad7536952b9de59a0571a55db2 | |
| parent | 104a786e2b58d40a17a26a4c84c3337279aefb1c [diff] | |
| parent | d15d5c8bd4a7208b3d40cefb3c2ed45c6971a5ff [diff] |
am fcc60692: (-s ours) am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'fcc606922944bbc4e5e55b96eec5e0565f10b710': Import translations. DO NOT MERGE