| commit | 7ef557764c27efc5766c849b4982c70d05864dfe | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 05:52:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 05:52:01 2014 +0000 |
| tree | a9be8ce3874cbc25e1530a0b5bc74a01ddae68c3 | |
| parent | 49bb8cdc5ecf42bdb66d948a900bee10de1c8323 [diff] | |
| parent | e134ac1cece66293b31543948fbabc5b7fc64b94 [diff] |
am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e134ac1cece66293b31543948fbabc5b7fc64b94': Import translations. DO NOT MERGE