Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
fix after merge
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cm-10.1-mb52x/cm-10.1' into cm-10.1-mb52x

Conflicts:
	services/java/com/android/server/usb/LegacyUsbDeviceManager.java