| commit | 1dc122067932455d1e9c79fdbe97a361d824cf96 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 12:56:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 12:56:32 2015 +0000 |
| tree | f571749292893ee67cd3b7fa8c8b7f1ee25fc81f | |
| parent | 8458e531bfc681ebb0de98476d782ca4d052a145 [diff] | |
| parent | 51448a1a604ca7e4c8cedeb31d2907bcca524f6e [diff] |
am 51448a1a: (-s ours) am e35b3e38: (-s ours) Import translations. DO NOT MERGE * commit '51448a1a604ca7e4c8cedeb31d2907bcca524f6e': Import translations. DO NOT MERGE