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

am d2e0cb16: (-s ours) am a3a59c79: (-s ours) am 382e35b8: (-s ours) Import translations. DO NOT MERGE

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