tree c474df7d1925e2310d516e08d148585bfa7186e1
parent 900de8e8829ea9eda21f242ffd6d3feebbd323eb
parent f180497bc303af666d2672fc268730f4ec1c771b
author Baligh Uddin <baligh@google.com> 1392154339 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392154339 -0800

am f180497b: (-s ours) am 57251be2: (-s ours) Import translations. DO NOT MERGE

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