OSDN Git Service

Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c
authorRubin Xu <rubinxu@google.com>
Tue, 19 Mar 2019 18:38:15 +0000 (11:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Mar 2019 18:38:15 +0000 (11:38 -0700)
commit96fa2e2417f0154a1f915bc766a82991cd08fe2a
tree7235dfdd072e2ff59e3e2cb9d833f37cbd98c3dd
parent4587994398fa900f0e1dea9af6bc5e8f23e1d6fe
parent030f2bd0ac1a31f41a2f3412e43dd9b521a742ed
Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c
am: 030f2bd0ac

Change-Id: Id0b366147c6222d82a03edcd6a8093c25a0ce596