tree c4846fed5ca8121b822da4df5a3cb35d436c79f4
parent 4945ac8099eb35112307f94c7c5ea7513f657fd3
parent 5a35fc139c772f04a1b314eb7a4062e16cfa8ebd
author Baligh Uddin <baligh@google.com> 1383686819 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383686819 -0800

am 5a35fc13: (-s ours) am 79098ae2: (-s ours) Import translations. DO NOT MERGE

* commit '5a35fc139c772f04a1b314eb7a4062e16cfa8ebd':
  Import translations. DO NOT MERGE