| commit | b2befd5dbbdf8f2c34a9a6fa688f0e9e58b0901e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 03 14:13:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 14:13:54 2015 +0000 |
| tree | 98e7456eec6fc6df6b7478bde91a23599e013a37 | |
| parent | b6ae409572f71cc5f4d71094e30c6be2a30ffddf [diff] | |
| parent | 9d3ae0416745fa4644e9e5951c96fec3a6208926 [diff] |
am 9d3ae041: (-s ours) am 32caf077: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '9d3ae0416745fa4644e9e5951c96fec3a6208926': Import translations. DO NOT MERGE