Manifest for Android 5.0.0 release 7
Merge branch 'android-5.0.0_r7' of https://android.googlesource.com/platform/manifest into default

Conflicts:
	default.xml

Change-Id: Ife047801b35c680b3ca151b21229fbd0ff6b5c35