OSDN Git Service

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10
authorJason Monk <jmonk@google.com>
Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)
am: 1a2133629f

Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec


Trivial merge