[RyanCahoon]

Like [Jared341] said, robotics is indeed multidisciplinary. You can get into robotics focusing on any of the fields you mentioned (and many more in addition to those: neural science, cognitive psychology, mathematical sciences, etc.), but if CS is your passion, definitely focus on that. But yes, electronic and/or mechanical familiarity will indeed help you when you actually have to work with the mechanical beasts themselves.

Here's my generic recommendation:
Some of the best advice I've ever heard is to not think so much in terms of majors or minors (yes, your college will make you declare one at some point), but instead look at the course offerings and research opportunities that are available at your university and get involved in the ones that really capture your interest. The extra pieces of paper look nice on resumes, but they just say that you took all the courses that somebody decided were necessary to obtain an adequate knowledge of some subject. The cliche is that a lot the knowledge you'll end up using in your job probably hasn't even been discovered yet; maybe you'll even start your own new academic field.

--Ryan