tree 0f635324aed1783b7cde395d5a0eda0eb29e74df
parent 618e065cc14b9069954e462fc25cdc934ee3300f
parent 6468a29765cefff2ae094896dd2ce4092b5d2049
author Geoff Mendal <mendal@google.com> 1439044468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439044468 +0000

am 6468a297: (-s ours) am 326afbf4: (-s ours) am 2393f7e2: (-s ours) Import translations. DO NOT MERGE

* commit '6468a29765cefff2ae094896dd2ce4092b5d2049':
  Import translations. DO NOT MERGE