tree 9908c0cd0d0990637627e45b739be3debd8cc514
parent 1b432c135f5238eb7bc251a6c45acf1ac8a402d2
parent fafe6dd57161201f824c93367045329ca4c09ef5
author Winson Chung <winsonc@google.com> 1559612318 -0700
committer android-build-merger <android-build-merger@google.com> 1559612318 -0700

Merge "Fix regression in swiping up from lockscreen" into qt-dev
am: fafe6dd571

Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b