| commit | 4d0dbae723e47c257e1c96cb23ac49be4698d28b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Dec 05 16:25:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 16:25:37 2014 +0000 |
| tree | 5755e19247b15dc06d9d5bafbe3874cb58c5e1fc | |
| parent | 87f3627ade3bdad4bd05986f67d192abe19d7935 [diff] | |
| parent | d6175b625845ab54060be699a4e47d024ee08331 [diff] |
am d6175b62: (-s ours) am 877efd1b: (-s ours) am 03d63c03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd6175b625845ab54060be699a4e47d024ee08331': Import translations. DO NOT MERGE