tree d35d6da1a506d3c5949db2677ac3d18b6b1e90ff
parent 7f4d6d6645682c4567b15e9f3e2a0350c85d809c
parent ab6527da412bf944df08429c697f5fcf94f8bb52
author Geoff Mendal <mendal@google.com> 1416843242 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416843242 +0000

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

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