tree 58fb0a61b2ec3338c8c5456c04fe0ae44978434f
parent a9024556c4d838667913af5c234e47d728cc5fa4
parent dd914cc253afcccd0513df90f22013d8ad01a18a
author Baligh Uddin <baligh@google.com> 1386799680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386799680 +0000

am dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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