Manifest for Android 5.0.2 release 1
Merge branch 'android-5.0.2_r1' of https://android.googlesource.com/platform/manifest into android-lollipop

Conflicts:
	default.xml