| commit | 1fc118ebd240bfd0abbe417614f4e758c1b14710 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 21 19:05:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 19:05:04 2015 +0000 |
| tree | 35f104f54ca3e66d39f73b35431689a87041b62f | |
| parent | 7153e396243ade7169edc0063e4728708346a41c [diff] | |
| parent | 352704616c052958257de02538be92e7caf2e592 [diff] |
am 35270461: (-s ours) am b1aaee53: (-s ours) am 68beeabc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '352704616c052958257de02538be92e7caf2e592': Import translations. DO NOT MERGE