tree 2f437fc33ac2de8e625c03cfd4f3e835b9b3a8f3
parent 7e420ae0d6432a5236d10c018b4f42ab34441085
parent 9e218eaf2398e72619ab8dcd596ca99bfc85746b
author Geoff Mendal <mendal@google.com> 1436382749 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436382749 +0000

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

* commit '9e218eaf2398e72619ab8dcd596ca99bfc85746b':
  Import translations. DO NOT MERGE