| commit | c531bb2dc694edb6f2d9178fd6f437086e23931e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:25 2015 +0000 |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 | |
| parent | f8434712def33aef77067a18845509f7ee8394ee [diff] | |
| parent | 7c2f41482d990c65c2659fa934bdc8a5c04c26a8 [diff] |
am 7c2f4148: (-s ours) am a8bbc7ac: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '7c2f41482d990c65c2659fa934bdc8a5c04c26a8': Import translations. DO NOT MERGE