OSDN Git Service

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

Change-Id: I71ec6332996262025d65099b92603719753d8fe2


Trivial merge