Merge "Disable moving 3rd party apps to internal if not allowed."

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 20 Jan 2017 00:57:31 +0000 (00:57 +0000)

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

Fri, 20 Jan 2017 00:57:36 +0000 (00:57 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 20 Jan 2017 00:57:31 +0000 (00:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 00:57:36 +0000 (00:57 +0000)
diff --cc core/java/android/app/ApplicationPackageManager.java
Simple merge
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 20 Jan 2017 00:57:31 +0000 (00:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Jan 2017 00:57:36 +0000 (00:57 +0000)
		1	2
core/java/android/app/ApplicationPackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history