tree d3148a5d8d26c3d6cf6a8a55a69c0f77887a143b
parent 8c1491c43cf1f1e3d8f373b1d2dfee42a7df98a2
parent 8e704b840386113d9012092d3da8e93928f03a2d
author Baligh Uddin <baligh@google.com> 1380991024 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991024 -0700

am 8e704b84: (-s ours) Import translations. DO NOT MERGE

* commit '8e704b840386113d9012092d3da8e93928f03a2d':
  Import translations. DO NOT MERGE