git loves to not merge files

...

 Changes to be committed:
	new file:   packages/SystemUI/src/com/android/systemui/statusbar/toggles/VolumeToggle.java