commit | da1404d02d22dde2cd4e79eaed46a48e40eefe29 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Aug 19 14:15:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 14:15:34 2015 +0000 |
tree | fe3eca847df60d9d96680052f34ce6d3b5b2f92e | |
parent | 44ad8a51158e2712f2400276cdf8faacb4c1454b [diff] | |
parent | 2c6fe6c1ca362411f42afc22bb4c08082d03b636 [diff] |
am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE * commit '2c6fe6c1ca362411f42afc22bb4c08082d03b636': Import translations. DO NOT MERGE