OSDN Git Service

Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
authorCharles He <qiurui@google.com>
Tue, 25 Apr 2017 19:01:35 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 19:01:35 +0000 (19:01 +0000)
commit9c5e33885055264b007345e51886557dfeaa2542
tree4cdf48854f6e856867ba3f3e4c84ca4edc9bf46e
parente8411c44540ca5195adf0250cc291be9d35d5a52
parent24157209c5772bf077bcabe6f4ae00ce1613bc4b
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
am: 24157209c5

Change-Id: I9d024aa89a2cf5315ef8e70d5bc93a472411d242