| commit | 1582fb37b3f57e5de068fb16d2e70ea8c74ea786 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:33 2015 +0000 |
| tree | 5465daae912e45f8fedaaf6b36ca7ae78efa39da | |
| parent | 25aaf785a738ed06692e140c49df4fc59ab5d3ef [diff] | |
| parent | b1670808057b3c88a5b1b650146a440c75802348 [diff] |
am b1670808: (-s ours) am 09265698: (-s ours) Import translations. DO NOT MERGE * commit 'b1670808057b3c88a5b1b650146a440c75802348': Import translations. DO NOT MERGE