OSDN Git Service

Merge "Fix available/remaining PIN/PUK attempts."
authorJordan Liu <jminjie@google.com>
Thu, 7 Dec 2017 23:30:02 +0000 (23:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 23:30:02 +0000 (23:30 +0000)
commitcc3058f0a103b1148b44eefb3b11de4346e36332
tree3b55b23d7cde991e828ceee0253733a0d50993fe
parentc2205a8d3dac9a0a5d2cf1d208aa46838369b81e
parente3ab43eefe7221683c9e83b4f9af6f30e313d61a
Merge "Fix available/remaining PIN/PUK attempts."
am: e3ab43eefe

Change-Id: Ia10a529b8d9817fe00d8688c78e3499327c9a8c6