| commit | be023f99c9ece56b3f89f5e087023bd3e3d9da97 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Apr 17 16:26:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 16:26:52 2014 +0000 |
| tree | e9a613b22502ff287e8967356a5619503afc3838 | |
| parent | a8d2fdf715d72c92a13963f8b72f7431cb4ec651 [diff] | |
| parent | 7cb0cc1b29ebca17933ac4b7fabc80f04d17a767 [diff] |
am 7cb0cc1b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7cb0cc1b29ebca17933ac4b7fabc80f04d17a767': Import translations. DO NOT MERGE