tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 243040fc0f7e6927331a7c33f3dcf532106c5855
parent 6c983895cd42b71ddb43756f92be7420024ba908
author Baligh Uddin <baligh@google.com> 1392411665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411665 +0000

am 6c983895: (-s ours) am fdfebdad: (-s ours) am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

* commit '6c983895cd42b71ddb43756f92be7420024ba908':
  Import translations. DO NOT MERGE