| commit | da409fea8230c49666ed634aeb7db629fb9425f3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 18:37:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 18:37:38 2014 +0000 |
| tree | c9dbda26a28f2fe01be2dc89f2755fea8bd4b80e | |
| parent | afd6f5a37ec4c39fffdb5f29fff7450284a3c562 [diff] | |
| parent | 5431d1e9a4ad23debe007693f0be2dc8c31fa9e2 [diff] |
am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE * commit '5431d1e9a4ad23debe007693f0be2dc8c31fa9e2': Import translations. DO NOT MERGE