| commit | bcc5b07e99d6947ee4d0c9430899ce5485bcbaea | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 12:42:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 12:42:21 2015 +0000 |
| tree | 838e272e939b46eb3bcb26a7bda2db066a92cad0 | |
| parent | a8f3f067b672a8e055e76beee300cc2b1a8bea31 [diff] | |
| parent | 7521c1a03e929ab7d26d4492a434a4b33bfe52c3 [diff] |
am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE * commit '7521c1a03e929ab7d26d4492a434a4b33bfe52c3': Import translations. DO NOT MERGE