| commit | d9834e1b152ae46281fb5b93b8df56ef3bb0b423 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:12:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:12:03 2014 +0000 |
| tree | ae58a0b11552898f2cf79f87ee323d4d62d36063 | |
| parent | 3396d450532876c6be5883a854d90142aadb67f8 [diff] | |
| parent | da92846bd69378713dc2cf52de95267852d6d1c2 [diff] |
am da92846b: (-s ours) am 520da6e4: (-s ours) am e14c2cc1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'da92846bd69378713dc2cf52de95267852d6d1c2': Import translations. DO NOT MERGE