tree 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d
parent 82df3a03fd954fd9b1cca1fb7dc2a0ed415b791b
parent bb744789fb648a1c6ff531d9911a16408032a335
author Geoff Mendal <mendal@google.com> 1436802237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436802237 +0000

am bb744789: (-s ours) am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGE

* commit 'bb744789fb648a1c6ff531d9911a16408032a335':
  Import translations. DO NOT MERGE