tree 697ee617f71dc93b36c0225d67ab8a074b5ff712
parent 1c5102547b6e094ded86fd026c8f4d892e62dc7c
parent 18dc46e593caa21f061f00d6848b63ba59b26e2a
author Baligh Uddin <baligh@google.com> 1413734674 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413734674 +0000

am 18dc46e5: (-s ours) am 9d6d62d6: (-s ours) am 219d531a: (-s ours) Import translations. DO NOT MERGE

* commit '18dc46e593caa21f061f00d6848b63ba59b26e2a':
  Import translations. DO NOT MERGE