Merge "Change get/setAppDetailsActivityEnabled to get/setSyntheticAppDetailsActivityE...

author Ricky Wai <rickywai@google.com>

Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)

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

Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)
author Ricky Wai <rickywai@google.com>
Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/app/ApplicationPackageManager.java
Simple merge
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
author	Ricky Wai <rickywai@google.com>
	Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/ApplicationPackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history