| commit | 188416bf38a2531158a8447f0f7b5719f22a39fd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 18:01:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 18:01:46 2014 +0000 |
| tree | 9266ac2d82e28e14aeaee3765882e0229d6674ca | |
| parent | ef8c3cc4f663875f6b5c62364d4bc61080d3a23d [diff] | |
| parent | 2d7e612ed1df3580d35cfc94bbcba660f0f058e2 [diff] |
am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2': Import translations. DO NOT MERGE