commit | 165b5d2f0186d78c93601e47b4bb939e98786b31 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:15 2015 +0000 |
tree | 8224f9346e4b6dae18b1147fac2b5c213d52ed3f | |
parent | b0de32d6ac51db1bd031552a880374579d3790ed [diff] | |
parent | e0bd97bf4aecae9be3e475fe7367ceeda4434a92 [diff] |
am e0bd97bf: (-s ours) am 4e18fb99: (-s ours) am 98ec64cc: (-s ours) am b778fdff: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit 'e0bd97bf4aecae9be3e475fe7367ceeda4434a92': Import translations. DO NOT MERGE