Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 971424e7 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

[automerger skipped] Merge "Only delay bouncer if bypass is off" into... 

[automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af -s ours
am: 56b04b17 -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 d969b762 is in history

Change-Id: Ic52b1929c53f7534136b727bd4c357698fdaa011
parents 79a3f283 56b04b17
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment