tree 5611785acb5387cfe3ff77b2e50c7d99a5bb3e62
parent 8a463d55b81008ddc8fb1c3fd0c83ad5678f6c51
parent c4127f91eb9c1f46e2c1b3d1f6184926817ed866
author Geoff Mendal <mendal@google.com> 1415054149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415054149 +0000

am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE

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