tree ecfe4b336de47f713352654de9d57795cf21cbfd
parent cbd269e1645b1a689af4076852345ff73b4a6074
parent a35ac4d8fa8d44e3274d17c17da63a4a0a710936
author Baligh Uddin <baligh@google.com> 1411583248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411583248 +0000

am a35ac4d8: (-s ours) am b16f6dad: (-s ours) am 87772f1f: (-s ours) am db330a39: (-s ours) Import translations. DO NOT MERGE

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