tree 54f863d1e1b179855bf8931b5deea5d6f9264cc4
parent a5f543db022c98a1d27a4d2ac3117556bbd1b4c4
parent 30a1b797eab8e716754762fad0cc87c9a1dc14f8
author Baligh Uddin <baligh@google.com> 1386809176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386809176 +0000

am 30a1b797: (-s ours) am beedbb63: (-s ours) am b783fd4f: (-s ours) am 9ad6bdb9: (-s ours) Import translations. DO NOT MERGE

* commit '30a1b797eab8e716754762fad0cc87c9a1dc14f8':
  Import translations. DO NOT MERGE