tree 39a673d6a92271c4bcf870838e0c60dfa418c0d0
parent a5361f57a0dd501a28345a393a5df36b3a2d4905
parent 5ecfed31d5b3fbcde85c266562b8c4a7c2195436
author Baligh Uddin <baligh@google.com> 1442631870 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631870 +0000

am 5ecfed31: (-s ours) Import translations. DO NOT MERGE

* commit '5ecfed31d5b3fbcde85c266562b8c4a7c2195436':
  Import translations. DO NOT MERGE