tree d4d02d27a8b4f3d85b63e1c980aea10756a99475
parent 53e2a9b0aef3df2418e59348bd2694cfe67551bf
parent ca88e5fb187390f413dd8f581e171597dac84746
author TreeHugger Robot <treehugger-gerrit@google.com> 1557896672 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1557896672 +0000

Merge "Block face auth when lock icon is pressed" into qt-dev