Merge "DO NOT MERGE: Delete persisted historical app ops on package uninstall" into...

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

Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)

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

Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)
diff --cc core/java/android/app/AppOpsManager.java
Simple merge
diff --cc services/core/java/com/android/server/appop/AppOpsService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)
		1	2
core/java/android/app/AppOpsManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/appop/AppOpsService.java	patch \|	diff1 \|	diff2 \|	blob \| history