Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc

author Calin Juravle <calin@google.com>

Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)

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

Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
author Calin Juravle <calin@google.com>
Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
diff --cc core/java/android/content/pm/PackageParser.java
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Calin Juravle <calin@google.com>
	Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
		1	2
core/java/android/content/pm/PackageParser.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history