Merge "Build dark greylist from public + light grey API" am: 60229832de am: bd0dd0e59f

author David Brazdil <dbrazdil@google.com>

Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)

committer android-build-merger <android-build-merger@google.com>

Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)
author David Brazdil <dbrazdil@google.com>
Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)
diff --cc Android.bp
Simple merge
diff --cc Android.mk
Simple merge
author	David Brazdil <dbrazdil@google.com>
	Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history