| commit | 625373f08e88e059dddc17bf4acd72f48141722a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:34:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:34:04 2015 +0000 |
| tree | c97eb0918b1bbbbff2543256747adb6c2f0ef439 | |
| parent | be792e46583ab56bca3a9793ae1d5a0bdc2ed130 [diff] | |
| parent | fa2346325615371139943d3ea1be12410b917965 [diff] |
am fa234632: (-s ours) am daf0cbb2: (-s ours) am 432f67c4: (-s ours) am d28d46e3: (-s ours) am 22c0a189: (-s ours) Import translations. DO NOT MERGE * commit 'fa2346325615371139943d3ea1be12410b917965': Import translations. DO NOT MERGE