OSDN Git Service

Merge "Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 18 Jan 2017 17:57:59 +0000 (17:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 17:58:04 +0000 (17:58 +0000)
commite24743203591fde0f3b1fe7d5e250f2b21ec0b6a
tree76ff160d04685fa265235a26eecfcabd7a53336b
parent094119df3ebc49b7158aa448fe3cc24ad4267569
parentd084ca5fad1cef70aac9eed8d5d79fc87d6e5397
Merge "Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner"
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java