| commit | 57faaab7f5deaf3ba87e5d493acb0d744a804f68 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Aug 05 13:31:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 05 13:31:21 2014 +0000 |
| tree | fd562a87480ee4c0c7632595a772ad4e64279315 | |
| parent | e833a7f70aee20a2c87b285fc7419305dfb53b02 [diff] | |
| parent | 0f42fe23abd20663cc1e0ea4cfce8b4f6ed09c13 [diff] |
am 0f42fe23: (-s ours) am c8e35f48: (-s ours) am 7c366c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0f42fe23abd20663cc1e0ea4cfce8b4f6ed09c13': Import translations. DO NOT MERGE