| commit | b938ac73cc87251c1b606278ebdda83651e4840d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:47 2015 +0000 |
| tree | fff1611f7ed52ed1387f16ca70bcbd86804ab620 | |
| parent | 46137f8b3564bc0fb6c0b26034b57771eba1e738 [diff] | |
| parent | f0403fdbca782a1d2519e017d130e19828136384 [diff] |
am f0403fdb: (-s ours) am 9d3aeeb9: (-s ours) am 6a694a1b: (-s ours) Import translations. DO NOT MERGE * commit 'f0403fdbca782a1d2519e017d130e19828136384': Import translations. DO NOT MERGE