Merge "Make sense out of scan & parse flags"

author Todd Kennedy <toddke@google.com>

Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)

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

Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)
author Todd Kennedy <toddke@google.com>
Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
diff --cc core/java/android/content/pm/PackageParser.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Todd Kennedy <toddke@google.com>
	Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)
		1	2
core/java/android/content/pm/PackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageParser.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history