tree 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87
parent d7f602577ee1c47d2c7eb280977039eb03cce0e4
parent 2c3102fd170eee806ae37207a49ef7a019ecd090
author Geoff Mendal <mendal@google.com> 1433178586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433178586 +0000

am 2c3102fd: (-s ours) am 76c3a31e: (-s ours) Import translations. DO NOT MERGE

* commit '2c3102fd170eee806ae37207a49ef7a019ecd090':
  Import translations. DO NOT MERGE