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