| commit | 6136caa3ac5d7a126faeeb986e8b24779b7bb328 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:58:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:58:00 2014 +0000 |
| tree | 37978b6232a6c35dd586d00a6b951f0f4b3555b3 | |
| parent | bdc91923fc72579fd9fad79b581c7ceb1cba7534 [diff] | |
| parent | cdbcb98751f0f986968a8e44a70975e511f1fea6 [diff] |
am d8e80699: (-s ours) am 7b7f0def: (-s ours) Import translations. DO NOT MERGE * commit 'd8e806993ae11e44d9167a52cf0ece1a52fdb35b': Import translations. DO NOT MERGE