| commit | 92aaaa88d31e21ca72d24ad047195779be83bdcd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 18:56:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 18:56:18 2015 +0000 |
| tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
| parent | 013b37a7e91e27eb060a6a23ac607a7172f2b058 [diff] | |
| parent | 9206174e6ba94bb2b11871c983c74989684ecf4f [diff] |
am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '9206174e6ba94bb2b11871c983c74989684ecf4f': Import translations. DO NOT MERGE