OSDN Git Service

[automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev
authorLucas Dupin <dupin@google.com>
Sat, 24 Aug 2019 03:09:10 +0000 (20:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Aug 2019 03:09:10 +0000 (20:09 -0700)
commit56b04b1721ea4e3ca23fe03e9231ef2d4d88d230
treee180c31163995151997d954577eb25754ef987b1
parent5c56a5e6914647f9f30fd9492546dd6c146378d3
parent255777af564d75b098b7616984ec11eafa6c6e81
[automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev
am: 255777af56 -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 d969b76224 is in history

Change-Id: Iba1881c5ec53168ee0352eb0ebd4b7ab689e52bc