| commit | aa9308f1c71ad9d5ef49c6edbe9e83e0311b8eed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 00:07:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:38 2014 +0000 |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
| parent | fdf61704bc92ccdcb4806635ad35caf717a1cd51 [diff] | |
| parent | 69ee12342ab4606e64504f116c53271773b5a834 [diff] |
am 69ee1234: (-s ours) am 197af09e: (-s ours) am 864a1a6a: (-s ours) am e0fe275a: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '69ee12342ab4606e64504f116c53271773b5a834':