| commit | a25ba2aca98ccf9d2994422f5da1246a23065265 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 23:25:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:25:47 2015 +0000 |
| tree | 53e6fdc391c2016b13aebcbbc2ad604de54681b8 | |
| parent | 0702e87ed4d13eac053c31ea1f6504d7f176da6d [diff] | |
| parent | 2061f4e296a94093920c772cfeb12c03eac98ac6 [diff] |
am 2061f4e2: (-s ours) am cfad6fc1: (-s ours) Import translations. DO NOT MERGE * commit '2061f4e296a94093920c772cfeb12c03eac98ac6': Import translations. DO NOT MERGE