| commit | 37c2aae1611050352c69cf59d2f8130da5b90260 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 27 23:22:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 23:22:19 2014 +0000 |
| tree | 1745ee70cbb0945606248d97d4222cc4801d19af | |
| parent | 01b2ebf896fd36430d58c8b5bb012633d9b5c79f [diff] | |
| parent | 7d1ad869127ea8a19cb8cef06d5f823b8295b546 [diff] |
am 7d1ad869: (-s ours) am e136f5e2: (-s ours) am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7d1ad869127ea8a19cb8cef06d5f823b8295b546': Import translations. DO NOT MERGE