tree 1263880e07d83b9b9870de6a932723816b48af7d
parent d61ca965786b022cd822297657fb0fddfffa28d6
parent 57afae6301affdcf8a9d670c37a98ca4c73bf56b
author Baligh Uddin <baligh@google.com> 1387467479 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387467479 -0800

am 57afae63: (-s ours) am 1643edf6: (-s ours) Import translations. DO NOT MERGE

* commit '57afae6301affdcf8a9d670c37a98ca4c73bf56b':
  Import translations. DO NOT MERGE