tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent 6f34a11eeacdee22b482c0d6dd31d04d5eb5fd6e
parent 73b1d5662f4f09aa19a91ac5d42910a135bb54a8
author Baligh Uddin <baligh@google.com> 1392410207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410207 +0000

am 73b1d566: (-s ours) Import translations. DO NOT MERGE

* commit '73b1d5662f4f09aa19a91ac5d42910a135bb54a8':
  Import translations. DO NOT MERGE