tree 908dad76e55264c16d0c97fb3f6674044c86b21b
parent 2cd8c28027e47ea405e666c2b1ccb862d4f38bdb
parent 785bfe719c408b6b188ea23a8472eccf9fbd3532
author Geoff Mendal <mendal@google.com> 1423769504 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423769504 +0000

am 785bfe71: (-s ours) am 31010cc1: (-s ours) Import translations. DO NOT MERGE

* commit '785bfe719c408b6b188ea23a8472eccf9fbd3532':
  Import translations. DO NOT MERGE