Merge "Allow UiAutomation to adopt the shell permission indentity"

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

Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)

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

Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/app/IActivityManager.aidl
Simple merge
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/IActivityManager.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history