| commit | eccd2e2e52c9d0504d9921090d2c0fb95005e179 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 13:52:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 13:52:55 2015 +0000 |
| tree | fdb9a90e2e19391c576bbf727db2a52f99ddb0c1 | |
| parent | 6b927133432b1a4307d2c4d86ca7f0efa0b3a7e3 [diff] | |
| parent | ced41e7803301bbbc1b41b3fce81e41475034c66 [diff] |
am ced41e78: (-s ours) am 82aacfdc: (-s ours) Import translations. DO NOT MERGE * commit 'ced41e7803301bbbc1b41b3fce81e41475034c66': Import translations. DO NOT MERGE