| commit | a69996e45c7c40d971b05a56866b7ac5c7f617de | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:42:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:42:58 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | 2f07a7059f4471963c114b0ab944249e8746cbf9 [diff] | |
| parent | 701449e85395d7a81d244d4b115b9ef4ae2f06d9 [diff] |
am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '701449e85395d7a81d244d4b115b9ef4ae2f06d9': Import translations. DO NOT MERGE