OSDN Git Service

Merge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
authorLucas Dupin <dupin@google.com>
Mon, 21 May 2018 19:45:48 +0000 (12:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 19:45:48 +0000 (12:45 -0700)
am: 1c63bdcce2

Change-Id: I38cfb0e6560e70c4a9bb66d48a18cdc5d84b89f8


Trivial merge