tree 4704d76fbce1cfee999c22731e244ae7717ef6ad
parent 3f2ece6ceae3923dca0d54b2e65fa16e79e3752c
parent 4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b
author Geoff Mendal <mendal@google.com> 1421080827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421080827 +0000

am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE

* commit '4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
  Import translations. DO NOT MERGE