tree 64c27f44daabf65a41d8df1c9098ad59039fbb1b
parent f69007a64267fb914bd8401952ec283c31f72ae5
parent 86538debcdf7c59cf6e299c5c4c6ac1f883c2ed1
author Baligh Uddin <baligh@google.com> 1398219636 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398219636 +0000

am 86538deb: (-s ours) am 325f3e0f: (-s ours) Import translations. DO NOT MERGE

* commit '86538debcdf7c59cf6e299c5c4c6ac1f883c2ed1':
  Import translations. DO NOT MERGE