tree eba31b370a1a51c86ce12ab94c823efd3646ad65
parent 3772ffdc4dd0fafaaa585429bbae466956787ca8
parent 16815264dd40b41cd1ad6a76b8f259a0f179b221
author Selim Cinek <cinek@google.com> 1562013509 -0700
committer android-build-merger <android-build-merger@google.com> 1562013509 -0700

Merge "Improved the unlock animation when bypassing" into qt-r1-dev
am: 16815264dd

Change-Id: Idae198e0483c7e0dd41618be0259e58a1e276e64