Merge "Introduce logout button and DevicePolicyManager API to enable it"

author Alex Chau <alexchau@google.com>

Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)

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

Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)
author Alex Chau <alexchau@google.com>
Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc core/java/android/app/admin/IDevicePolicyManager.aidl
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Alex Chau <alexchau@google.com>
	Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 Dec 2017 20:16:24 +0000 (20:16 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/IDevicePolicyManager.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history