tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent d2e0cb16e537e43e41c288034b5baa2177a9c2c8
parent b1884ebe5d9c97608703065ec446250a874ef588
author Geoff Mendal <mendal@google.com> 1436979461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979461 +0000

am b1884ebe: (-s ours) am 3a61d0f3: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE

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