Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev

author Dianne Hackborn <hackbod@google.com>

Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)

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

Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/clipboard/ClipboardService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 Apr 2018 20:59:04 +0000 (20:59 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/clipboard/ClipboardService.java	patch \|	diff1 \|	diff2 \|	blob \| history