| commit | e7dd0d71a00b434d1d93115b5a1cd9299e4c192c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 14:05:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 14:05:22 2015 +0000 |
| tree | e3629aaad362e3c8dd3f68599bd84ed39be5c680 | |
| parent | 38a949fad25ff103ed05b9b38dea47e7410690ca [diff] | |
| parent | eccd2e2e52c9d0504d9921090d2c0fb95005e179 [diff] |
am eccd2e2e: (-s ours) am ced41e78: (-s ours) am 82aacfdc: (-s ours) Import translations. DO NOT MERGE * commit 'eccd2e2e52c9d0504d9921090d2c0fb95005e179': Import translations. DO NOT MERGE