| commit | af175130a3f1a8628aefd7aecd3f06b97c8f94ea | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:05:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:05:28 2014 +0000 |
| tree | e5369026136f79657e70661751fe1bf7f962af28 | |
| parent | 2e69edbf4e95b47456536c5c4ef25106d0ac3e93 [diff] | |
| parent | 30208e113fcc589edd57b5e8f232bc8d4850fff8 [diff] |
am 040c2036: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '040c203694f8aac0c50bdd089dee66db2baa468c': Import translations. DO NOT MERGE