Merge "Add handover permission, fill in some missing API gaps." am: 1dfa830bb0

author Tyler Gunn <tgunn@google.com>

Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)

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

Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)
author Tyler Gunn <tgunn@google.com>
Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history