tree 9c52b7cce9b8088cd19651005a5a187afc88301b
parent 10cabc6a72c509723f3d3d162e535ba01e926963
parent c916c808694ce31bfed4a634ef75304a8f3b248f
author Baligh Uddin <baligh@google.com> 1381018430 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381018430 -0700

am c916c808: (-s ours) am a01e5a4d: (-s ours) Import translations. DO NOT MERGE

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