| commit | ea1fb12bfec54b76121ba69268f4eebe6f198be3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:30:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:30:18 2015 +0000 |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 | |
| parent | b1646f8713a6877f0a36a68fe58ab9792aab887c [diff] | |
| parent | 25eb15bf608f2276aae32898026eca4bc43cb144 [diff] |
am 25eb15bf: (-s ours) am bc69f1c9: (-s ours) Import translations. DO NOT MERGE * commit '25eb15bf608f2276aae32898026eca4bc43cb144': Import translations. DO NOT MERGE