tree 7e4df3558bc03e22cc126ea21df131c5fd7df518
parent a5c539b34a4f406f5ccd7f06c4a02759a5a45987
parent 95269806cbd0f707f22be0a300e35267c3ae97bd
author Baligh Uddin <baligh@google.com> 1413748670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413748670 +0000

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

* commit '95269806cbd0f707f22be0a300e35267c3ae97bd':
  Import translations. DO NOT MERGE