Manifest for Android 5.0.0 release 7.0.1
Manifest for Android 5.0.1 release 1
Merge tag 'android-5.0.1_r1' into lollipopalooza

Android 5.0.1 release 1

Conflicts:
	default.xml