tree 2bd43c800a0404ebbd538861812f8759f09c4dd5
parent 2cc6834bf8561246651c59faa47ddd32462e5f5f
parent d88079f30b2cf947ddaaeec669973e0c61072abd
author Baligh Uddin <baligh@google.com> 1408286511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408286511 +0000

am d88079f3: (-s ours) am c3cc414c: (-s ours) am d19f38a9: (-s ours) Import translations. DO NOT MERGE

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