Skip to content
Commit 96fa2e24 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Notify caller when unlockUser() bails out" am: e7df4aa5 

am: 030f2bd0

Change-Id: Id0b366147c6222d82a03edcd6a8093c25a0ce596
parents 45879943 030f2bd0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment