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