| commit | 57d5cc8849d47ed22db2c33590a7bf073a63cf07 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 26 23:50:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 23:50:28 2013 +0000 |
| tree | cdf5365dcb27ee831323c80daa80d6e0225b14a3 | |
| parent | bf29cbbc1df534dcf2f8553c70920b7cc056e76c [diff] | |
| parent | 5cf8dc8ea5b364802f9e986ddb7f4e21652145be [diff] |
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 '5cf8dc8ea5b364802f9e986ddb7f4e21652145be': Import translations. DO NOT MERGE