tree c688ac2063b1f3920885b812acc3951359d8fa50
parent 4e3b221950d04ee97fd47942389a4f72d803ab2b
parent 72569a387742812be7e87362721631beaa05028c
author Baligh Uddin <baligh@google.com> 1404683185 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404683185 +0000

am 72569a38: (-s ours) am 03c79df9: (-s ours) am f70d0619: (-s ours) am e0bc7603: (-s ours) Import translations. DO NOT MERGE

* commit '72569a387742812be7e87362721631beaa05028c':
  Import translations. DO NOT MERGE