Merge branch 'mirror-aosp-master' of...

Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1567,7 +1567,7 @@ doc_defaults {
		metalava_annotations_enabled: true,
		metalava_previous_api: ":public-api-for-metalava-annotations",
		metalava_merge_annotations_dirs: [
		"tools/metalava/manual",
		"metalava-manual",
		],
		}