tree dc59097964552399310692bd5c2439157ee4bf30
parent 772298e750f85e6b7f8317e316085cacc1d01b27
parent 7bcab2da1afebf3eda3fb96402c507c0fea7f627
author Geoff Mendal <mendal@google.com> 1418230049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418230049 +0000

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

* commit '7bcab2da1afebf3eda3fb96402c507c0fea7f627':
  Import translations. DO NOT MERGE