| commit | afda110a489788e514708564e95b32d930fd97a3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:45:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:45:16 2014 +0000 |
| tree | 2281caadccd72129de9f88b3d3cc088967711447 | |
| parent | 41398aa48ae0b2290b5fde73e30712b8b83679d4 [diff] | |
| parent | 348b03bff44482a3cd004f0aec9b66b721a3b62e [diff] |
am 348b03bf: (-s ours) am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '348b03bff44482a3cd004f0aec9b66b721a3b62e': Import translations. DO NOT MERGE