| commit | 5a35aba8a7609ca601f882e9fe09d88b74e3236f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 18:49:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 18:49:17 2014 +0000 |
| tree | 1f0328f9a72792e081cd42df421c8f4c0f2f0803 | |
| parent | 1ceb0f2ea4e7bb11127e8360ca7e74c862500e18 [diff] | |
| parent | 1c837af01db817dea4d37ad62c5587b04352ba54 [diff] |
am 1c837af0: (-s ours) am 937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '1c837af01db817dea4d37ad62c5587b04352ba54': Import translations. DO NOT MERGE