tree f87bff9af41bf7547258d07c39ef808e4b8e9fac
parent 0a7e51d522a7fcf418eb13c50cc0babe5f886b5b
parent 54926ba6a9624845ca6d7161c35fef75d00a99c2
author Kevin Chyn <kchyn@google.com> 1524017420 -0700
committer android-build-merger <android-build-merger@google.com> 1524017420 -0700

Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev
am: 54926ba6a9

Change-Id: I151f4f09e2de5c7999b0ed13afa7b712781d468f