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