Skip to content
Commit c5728033 authored by Erin Yan's avatar Erin Yan Committed by android-build-merger
Browse files

[automerger skipped] Merge "Reduce the delay of showing unlock dialog to 0"... 

[automerger skipped] Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev am: 46e4dd09
am: 06ab601f -s ours
am skip reason: change_id I0016290a5181b9acba73503f938772b90f583f66 with SHA1 13ae817b is in history

Change-Id: I6e50ee04646bb018e2a462d2c418defecccaa627
parents 04e80fa6 06ab601f
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