commit | 6debfb90eea84959ab51a6c3585549dd48e277f3 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Dec 26 23:54:55 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 23:54:55 2013 +0000 |
tree | de75fd77c509b76e1e4733628bd2b649eee5e393 | |
parent | 00703316a8a53acb2c5a99adfcd3f2771f263b89 [diff] | |
parent | 57d5cc8849d47ed22db2c33590a7bf073a63cf07 [diff] |
am 57d5cc88: (-s ours) am 5cf8dc8e: (-s ours) am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '57d5cc8849d47ed22db2c33590a7bf073a63cf07': Import translations. DO NOT MERGE