| commit | 990d25bda02bbc85d999c10db55eeebd85bcc968 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 15 19:15:43 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 15 19:15:43 2017 +0000 |
| tree | b2e2d648dc4b2d61158ff81f1d456bf5d985ba0e | |
| parent | bcf01e7a2a906f2fc7663b36618fab013efe4cd1 [diff] | |
| parent | 129f60fecc9b87d68718ff0d72832e6aa86e09a8 [diff] |
Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev