Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev am: 6bf2990e28

author Todd Kennedy <toddke@google.com>

Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)

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

Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)
author Todd Kennedy <toddke@google.com>
Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
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, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	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