tree d49967581af8d8e6785d3350469614560af02a0f
parent d3cb31d66a1bf50619e5e3cea6701cfc3d24f400
parent 9f09df69c718900b971c4e1c5f886e24883e57ce
author Kevin Chyn <kchyn@google.com> 1546561965 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1546561965 +0000

Merge changes Ibff5b56f,I24f48aef

* changes:
  Add null checks in BiometricService
  Update BiometricPrompt icons and logic