tree eef6054084446dbba99fd39dfee7162ae96672bf
parent 8b6fd231e084b8dc6d55fc504cf5424dd49e07f9
parent 30de1b96924791419f02863e1f78195d03554f3a
author Baligh Uddin <baligh@google.com> 1412532722 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532722 +0000

am 30de1b96: (-s ours) am 4a2ad854: (-s ours) am 579a02f7: (-s ours) Import translations. DO NOT MERGE

* commit '30de1b96924791419f02863e1f78195d03554f3a':
  Import translations. DO NOT MERGE