| commit | a3918b489e02146ec284e876216f446af427369b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 15:03:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 15:03:16 2014 +0000 |
| tree | 2a80c65198114a210fc07be7512d62479ec624f2 | |
| parent | 07bf7e60a21c600ddd764a2d32e3fd849941d153 [diff] | |
| parent | 6f0802f40cf156509ae5da793e8599a0dd4b7cfa [diff] |
am 6f0802f4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6f0802f40cf156509ae5da793e8599a0dd4b7cfa': Import translations. DO NOT MERGE