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)
commit55682585c0558f68fbb321557ba5484d13f15768
tree2d4c2e4779832586aed45b0ac56f45e624c67aed
parent7986a1665115966aca643e6f34328cc33d8c75c2
parent05b3d95b65bfa395e388029f238f03b5cf75496f
Merge "Do not darken scrims when unlocking with fp" into pi-dev
am: 05b3d95b65

Change-Id: I35205e0b1e3ec5d1728826028ea88a230fb174fb