tree b2e2d648dc4b2d61158ff81f1d456bf5d985ba0e
parent bcf01e7a2a906f2fc7663b36618fab013efe4cd1
parent 129f60fecc9b87d68718ff0d72832e6aa86e09a8
author TreeHugger Robot <treehugger-gerrit@google.com> 1502824543 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502824543 +0000

Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev