| commit | 6e097cac856eb53e890920d53bce9943742c0da1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 19:23:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 19:23:35 2015 +0000 |
| tree | 1b3f6dbdedfed838dfc65aec0844f4f88bfd2d0c | |
| parent | 0feaa2f95ecbdc015a82ceb1122dc9ff64187e02 [diff] | |
| parent | fe29877b7b41953148907dbe98036a7064f7b0b5 [diff] |
am fe29877b: (-s ours) am 899bd8c6: (-s ours) am f42d5ee4: (-s ours) Import translations. DO NOT MERGE * commit 'fe29877b7b41953148907dbe98036a7064f7b0b5': Import translations. DO NOT MERGE