tree 0dfc26e5c216b00e5ce2ae15601a19dace4d18dc
parent 0c13a34fd1f32a8cb8c5cec06553e3741731c756
parent eb01b967460d0d8287042e5f6dd16578f3f59eb6
author Geoff Mendal <mendal@google.com> 1436996273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436996273 +0000

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

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