Checkpointing - Converting AccessoryController to a service
Retrying merge
Merge branch 'master' of https://github.com/ravikirankm/adco.git

Conflicts:
	app/google-play-services_lib/bin/adco-app-google-play-services_lib.jar
	app/usbHost/bin/classes.dex
	app/usbHost/bin/resources.ap_
	app/usbHost/src/com/google/android/DemoKit/MegaADKController.java