commit | 2c93fcacca9177473dd5f2ba98efa1d657fbea22 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:09:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:09:24 2015 +0000 |
tree | 00150c1f0a37179b532304998dbf8827467018df | |
parent | 25eb15bf608f2276aae32898026eca4bc43cb144 [diff] | |
parent | efa098a763969cb96e09e12331bf43d5991b8d93 [diff] |
am efa098a7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'efa098a763969cb96e09e12331bf43d5991b8d93': Import translations. DO NOT MERGE