| commit | 9340911fdde0dd881eba33a546d9246233e9d9cf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 20 00:40:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 00:40:38 2014 +0000 |
| tree | d09d84f24adf29573ee1f31ea1c02b46dc75ea4a | |
| parent | dc4b7e3dc093e10b110ca11112f082137387a562 [diff] | |
| parent | 80eb5b301b865d72da5b061b92e109248d2e1727 [diff] |
am 80eb5b30: (-s ours) am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '80eb5b301b865d72da5b061b92e109248d2e1727': Import translations. DO NOT MERGE