| commit | 6c02d9239885a529d4b160aa3938b14c61fbc3fd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:22:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:22:42 2015 +0000 |
| tree | 52e9edfa13b55ca5cecef2229941cc72dae7badb | |
| parent | f6ee5dbc5efc90467dd46c5317807676fdaf8ae6 [diff] | |
| parent | 77c5de0d68fb1e40e01082cf97758b2d35bfca91 [diff] |
am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '77c5de0d68fb1e40e01082cf97758b2d35bfca91': Import translations. DO NOT MERGE