tree e0fea6e22b486d7e47f83f2921a9b529f9f100d0
parent e409561a1757cd9004e50ce5ab3c4e29a747a3c5
parent 5b95c755821a966b411b164df18b928d2eda71f1
author Geoff Mendal <mendal@google.com> 1416419805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416419805 +0000

am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE

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