| commit | 2589d8e12de80535defb6e8ddae5ca971a64feb5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 18:06:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 18:06:55 2014 +0000 |
| tree | 7c3b4dd730892ef6270834427af8f6b76e0cde53 | |
| parent | 3765ae9ff1a7584623f5f4c69d50bdf011664f81 [diff] | |
| parent | 188416bf38a2531158a8447f0f7b5719f22a39fd [diff] |
am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '188416bf38a2531158a8447f0f7b5719f22a39fd': Import translations. DO NOT MERGE