tree 03922554b3dfb5e78d27717d7edd5199fe1ff852
parent 497fcd9fe7dde6d30e4778a2b33b32ef511d88c0
parent 879da353b6869c126e095d8f7bba5d351ca87432
author Baligh Uddin <baligh@google.com> 1442632429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632429 +0000

am 879da353: (-s ours) am e57e462a: (-s ours) Import translations. DO NOT MERGE

* commit '879da353b6869c126e095d8f7bba5d351ca87432':
  Import translations. DO NOT MERGE