tree 6ff4cfcd36cb6f9fe356a5d26edac28d2ba4de8f
parent 18b63b847faf1c514c530bdb436fe763c53fedb9
parent f67706c43a524847d2495d1583ca97224931d3e4
author Robert Snoeberger <snoeberger@google.com> 1561397002 -0700
committer android-build-merger <android-build-merger@google.com> 1561397002 -0700

Merge "Retry auth during tap on lock screen." into qt-r1-dev
am: f67706c43a

Change-Id: I97afd99b91d7c0dbafa38cf4c6fa6b044890b7f3