OSDN Git Service

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

Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d


Trivial merge