OSDN Git Service

Merge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
authorKevin Chyn <kchyn@google.com>
Mon, 22 May 2017 23:09:35 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 23:09:35 +0000 (23:09 +0000)
commit1c38d4bbe7d4f694a1d1334c510853dd92ab6927
treea1588870d71953cfd91e80cbf36ff1f7fddcbd33
parente2878ff155f60a82fb3388f343023776617925ed
parent35fb3302d742672c3dcee5eae70f2b1f4dda4ae9
Merge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
am: 35fb3302d7

Change-Id: I94cfe913b3e66ce27a0ee7ea439d3ed6a77942f3
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java