tree 10d60a97a7e38df793d444a1999945e83c824cbc
parent c9dbc123ca8d35556a36444624cec7349a1f1aa4
parent 4024769fd1689dd6eef3d270966cd084a7b8df74
author Kevin Chyn <kchyn@google.com> 1559773252 -0700
committer android-build-merger <android-build-merger@google.com> 1559773252 -0700

Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev
am: 4024769fd1

Change-Id: I2f4c161376927cb526419fadb195c155a67b7e3b