tree 2502a323c2824f0820bfe40bd3a1d3c076341e0a
parent d326305b2567ef3ca9bb56205301b9e17631560d
parent 1c316b44e5596ef87654ed67ecd05e4048380498
author Geoff Mendal <mendal@google.com> 1436980144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980144 +0000

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

* commit '1c316b44e5596ef87654ed67ecd05e4048380498':
  Import translations. DO NOT MERGE