| commit | 5b704f8457ac4ca5b2ca6b0e8372ab88e51d83c1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:32:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:32:36 2015 +0000 |
| tree | 2e4fa29840402692105ad74f94c8d60793334a52 | |
| parent | 9fe7781171024a5046374d9c62d7c5affa049dc0 [diff] | |
| parent | d28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9 [diff] |
am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9': Import translations. DO NOT MERGE