tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent 322e1f57def9c86e735a94e8a92b6310655a6c33
parent 913cd0086cec15e05b2b64f9a3e14448b0c53df2
author Geoff Mendal <mendal@google.com> 1436801526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436801526 +0000

am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE

* commit '913cd0086cec15e05b2b64f9a3e14448b0c53df2':
  Import translations. DO NOT MERGE