OSDN Git Service

Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
authorBartosz Fabianowski <bartfab@google.com>
Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)
commit96a14ff07e7997d560235ed271076ee4b7087c33
tree9a1af594eeb761597e82a9c2ddd1aa622def60d0
parent7edaa60315e150f5f4833e5e2fb7507c665d5419
parent262aacd3530e47ba92f4b8a866a3c7203a01028b
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am: 262aacd353

Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java