Manifest for Android 5.0.2 release 1
Merge tag 'android-5.0.2_r1' into lollipop

Android 5.0.2 release 1

Conflicts:
	default.xml