tree 6d83f0cddc149683cf35fec8dc8045e7d6f677c0
parent 71d81d2d4c5732f20dba16a3c866b3d5f06f9ad4
parent 3d4796f452d46deea42549e240d0df859f51a594
author Lucas Dupin <dupin@google.com> 1556904184 -0700
committer android-build-merger <android-build-merger@google.com> 1556904184 -0700

Merge "Fix issue where navbar wouldn't be on lock screen" into qt-dev
am: 3d4796f452

Change-Id: Ibc3a7dc3598c27f16412d9b668b59b85a920f969