tree 362dbc9a8b19321e0786a5b37d508a643bf6cfc4
parent 785696573d947cd5365eee24af787fa259f3335f
parent 3f4060a0ade902f34598717c8315862133a5fd33
author Baligh Uddin <baligh@google.com> 1404681410 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404681410 +0000

am 3f4060a0: (-s ours) am 6072a256: (-s ours) Import translations. DO NOT MERGE

* commit '3f4060a0ade902f34598717c8315862133a5fd33':
  Import translations. DO NOT MERGE