Manifest for Android 5.0.0 release 2
Merge remote-tracking branch 'aosp/android-5.0.0_r2' into lollipop

Conflicts:
	default.xml