Merge "Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner"

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

Wed, 18 Jan 2017 17:57:59 +0000 (17:57 +0000)

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

Wed, 18 Jan 2017 17:58:04 +0000 (17:58 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 18 Jan 2017 17:57:59 +0000 (17:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 17:58:04 +0000 (17:58 +0000)
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 18 Jan 2017 17:57:59 +0000 (17:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jan 2017 17:58:04 +0000 (17:58 +0000)
		1	2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history