| commit | 70048744afc6987e9db42d47f3f8da573ef65101 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 20 19:04:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 19:04:11 2014 +0000 |
| tree | 05f416d9d7563115e3a2a12457e2f3ee89a92682 | |
| parent | 4a1bc7dfc1fc13c29e30353e488bd12ee91836cb [diff] | |
| parent | 826f3647a4a44ffcf154c63fe204a7787b96a657 [diff] |
am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '826f3647a4a44ffcf154c63fe204a7787b96a657': Import translations. DO NOT MERGE