| commit | e30f773ca54de3616cd1eeb935c871b60268b3c7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 15:25:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:25:25 2015 +0000 |
| tree | 6c609b081811e1254fb40632f46a01b37d5b2917 | |
| parent | b6dae108b33381f4478781136b0dc395fde38136 [diff] | |
| parent | 060b2ce9eaf77155024676f419ca37aa6c5ab895 [diff] |
am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '060b2ce9eaf77155024676f419ca37aa6c5ab895': Import translations. DO NOT MERGE