| commit | edf10cc26d579019a932cd3b23b4d77586c2370f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 22 03:17:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 22 03:17:07 2014 +0000 |
| tree | b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63 | |
| parent | aa587a922f215818f8c1b4d326cd769eee2e0ebd [diff] | |
| parent | 25fe41b8e0a0e7e80bcc533b5087d63767faa689 [diff] |
am 25fe41b8: (-s ours) am 74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '25fe41b8e0a0e7e80bcc533b5087d63767faa689': Import translations. DO NOT MERGE