| commit | a76344a10df53e17262cb7579ce047a760c5bc15 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Jun 26 16:54:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 26 16:54:50 2014 +0000 |
| tree | 4b1bf7c43eddc14cd87697d9c76cfa60d96cc073 | |
| parent | bc4e571c22508b3a9b20e479e5b3c6e410c52cb7 [diff] | |
| parent | 8137d89507c4baf3a74cdbaf9644e6a104a7dfd1 [diff] |
am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f': Import translations. DO NOT MERGE