Skip to content
Commit 97b5991f authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

[automerger skipped] Merge "Use UnlockMethodCache#canSkipBouncer in user... 

[automerger skipped] Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" am: 63e2a95b am: 941d4394 -s ours
am: 803f3e0a -s ours
am skip reason: change_id Idbff4fbabca962c632ff5d78b25418c0502db9a7 with SHA1 d2eb34b6 is in history

Change-Id: Ie8e9917a797a56e5bb9a498f0c2f7f49ab52ed36
parents 345a2b80 803f3e0a
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