| commit | dabf7799fd69656d26f242524ffaadc968f7b744 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:38:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:38:46 2015 +0000 |
| tree | d7f2d2b60059d695e915e3c8cb8ffe480cfc956c | |
| parent | 53d21fdf41859fcad623d3a3d779e000f35dfb7f [diff] | |
| parent | 0c736ebff8f893a2d719a5ffe416305327adc600 [diff] |
am 0c736ebf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '0c736ebff8f893a2d719a5ffe416305327adc600': Import translations. DO NOT MERGE