tree 2a8e16b5cea28e0c4830d9b5feff6a321913a161
parent 6f6fc9b4c218169fdc88c56ac86a0a20d66e239b
parent 5b36696e4280db82808a190dcd22cc1789ab991a
author Geoff Mendal <mendal@google.com> 1436998290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436998290 +0000

am 5b36696e: (-s ours) am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE

* commit '5b36696e4280db82808a190dcd22cc1789ab991a':
  Import translations. DO NOT MERGE