| commit | 4ea0f54da034efb148e174381efdcc4762633a5f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:49:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:49:03 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 41c35644aab2b21cda4bf14e329b162bd12660be [diff] | |
| parent | 18f458b14f77bb551665405859a93ed09e8ee3f9 [diff] |
am 18f458b1: (-s ours) am cbf49aa5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '18f458b14f77bb551665405859a93ed09e8ee3f9':