| commit | d6175b625845ab54060be699a4e47d024ee08331 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Dec 05 15:51:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 15:51:13 2014 +0000 |
| tree | cb9b38f4ec6b5fc5db5a777afba704e34280cddd | |
| parent | 3673604318ad7ab198de3734ad0a470a4c37c64e [diff] | |
| parent | 877efd1bb3ae5e9e5999b8e56fc4c2b27a2bbe99 [diff] |
am 877efd1b: (-s ours) am 03d63c03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '877efd1bb3ae5e9e5999b8e56fc4c2b27a2bbe99': Import translations. DO NOT MERGE