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