tree 492b54ce6906c49d53cc4b0c762c8e34145d9bc3
parent 54171504f4e8c827ced39a1e268cdbf1095094e6
parent 8aa955dc6aceb1782c77f746b83eb557134062ed
author Baligh Uddin <baligh@google.com> 1412023520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023520 +0000

am 8aa955dc: (-s ours) Import translations. DO NOT MERGE

* commit '8aa955dc6aceb1782c77f746b83eb557134062ed':
  Import translations. DO NOT MERGE