| commit | af3e2eb49cb3aff145d6ec87e0bbf79bf4e2d175 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 19:23:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 19:23:57 2015 +0000 |
| tree | 37e0fc1e80f6d47557fd4c984c9a0c1a0c99e001 | |
| parent | c875ad14ddc09d0d3a3bde58f71845123110f9f2 [diff] | |
| parent | b719afc18db99fc71468607d73031432117d6540 [diff] |
am b719afc1: (-s ours) am a88be530: (-s ours) am de399af7: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE * commit 'b719afc18db99fc71468607d73031432117d6540': Import translations. DO NOT MERGE