tree aa6f6ea6b0022338fa979e71f7e74fbf471cd094
parent d88a3cb7c5d39fc0e573a85cbce81796d1478d95
parent e0bc7603c65374edb8ebbfae08f7f0255e881fb4
author Baligh Uddin <baligh@google.com> 1404682516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682516 +0000

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

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