tree c688ac2063b1f3920885b812acc3951359d8fa50
parent d794d1172e2346c8f418d09d63890632b3d00b12
parent cae7ce93a49d5702cb5738148df18f43e3d6aa21
author Baligh Uddin <baligh@google.com> 1404683372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404683372 +0000

am cae7ce93: (-s ours) am 18a53ab1: (-s ours) am 13157532: (-s ours) am 2ea40009: (-s ours) am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit 'cae7ce93a49d5702cb5738148df18f43e3d6aa21':
  Import translations. DO NOT MERGE