tree 76ff5be3abf7f2abddd0b7bd61be625057cfaefe
parent 9bf1b92928b0c85abd60e643aba29d0a51691513
parent 74899e96b85fdb156394d75b9237df54015a0cfa
author Geoff Mendal <mendal@google.com> 1395089062 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395089062 +0000

am 74899e96: (-s ours) Import translations. DO NOT MERGE

* commit '74899e96b85fdb156394d75b9237df54015a0cfa':
  Import translations. DO NOT MERGE