tree 09f6d2a7fd13fdd6339c5ef5dc950174e71e77c9
parent bff2c12ae6ec7384b1f999e6c3d8533fce617992
parent b6ef8696d2d0f7631665f57aabd185393e2e9480
author Geoff Mendal <mendal@google.com> 1440887986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440887986 +0000

am f053e4b3: (-s ours) Import translations. DO NOT MERGE

* commit 'f053e4b3f423caa5b3215792f5c021168c7bacb0':
  Import translations. DO NOT MERGE