Merge "Droidfood only: Move private APIs to dark greylist by default"

author David Brazdil <dbrazdil@google.com>

Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)
author David Brazdil <dbrazdil@google.com>
Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/java/android/content/pm/ApplicationInfo.java
Simple merge
author	David Brazdil <dbrazdil@google.com>
	Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/ApplicationInfo.java	patch \|	diff1 \|	diff2 \|	blob \| history