| commit | 9641feee025cfd669cd4730bb0609ba16aaffc2a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 15:13:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 15:13:40 2014 +0000 |
| tree | 14a65974b35a00b5e3cff2ef53e4d1ea76cb989a | |
| parent | cb3a6f89f1d05f93eaf7b779a28d613d0c123729 [diff] | |
| parent | 38499cf8a129b15fd526d45aad96657d96235abf [diff] |
am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '38499cf8a129b15fd526d45aad96657d96235abf': Import translations. DO NOT MERGE