tree a2a480c1b918be74510c593bbd5f5c3ecf225692
parent e0bc7603c65374edb8ebbfae08f7f0255e881fb4
parent 23b816b1bafee73eee28caca3e2a2915f726bbd9
author Baligh Uddin <baligh@google.com> 1404682542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682542 +0000

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

* commit '23b816b1bafee73eee28caca3e2a2915f726bbd9':
  Import translations. DO NOT MERGE