| commit | d4f1967707e8b860c3a8781258ef4904bfd88e77 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:26 2015 +0000 |
| tree | 79de0b54c4ed116b94b8ebeb91aba64f74a5cd35 | |
| parent | 3ee6e4e9fb22143fc1072f44d914c56829a197db [diff] | |
| parent | 41ee6f9fca7ddd8b78e0890534fae8d9662c0ea6 [diff] |
am 41ee6f9f: (-s ours) am d850ea57: (-s ours) am 37cbe674: (-s ours) am 2a9bd871: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '41ee6f9fca7ddd8b78e0890534fae8d9662c0ea6': Import translations. DO NOT MERGE