OSDN Git Service

Merge "Do not darken scrims when unlocking with fp" into pi-dev
authorLucas Dupin <dupin@google.com>
Tue, 13 Mar 2018 03:16:35 +0000 (03:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Mar 2018 03:16:35 +0000 (03:16 +0000)
am: 05b3d95b65

Change-Id: I35205e0b1e3ec5d1728826028ea88a230fb174fb


Trivial merge