| commit | 5e60e7c1030630f4052fd29982c15fd4ed78ec5e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 14:18:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 14:18:24 2015 +0000 |
| tree | 132fe0227dbde77164cebf15e004915ca2d18bf4 | |
| parent | 116183ac89ffe253991766819e7eb3f748c67761 [diff] | |
| parent | eaaae47d8901dd59a536181e07d585fe29dc53cd [diff] |
am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE * commit 'eaaae47d8901dd59a536181e07d585fe29dc53cd': Import translations. DO NOT MERGE