Commit 1ff9dc99 authored Aug 24, 2019 by Android Build Merger (Role) Committed by Android (Google) Code Review Aug 24, 2019

Merge "Merge "resolve merge conflicts of...

Merge "Merge "resolve merge conflicts of bd592e04 to stage-aosp-master" into stage-aosp-master am: 6948bc8c am: 2b529144 am: 7a5ba3f5" into qt-qpr1-dev-plus-aosp

parents 2da6de04 6653f2b2

services/core/java/com/android/server/display/OWNERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,6 @@ michaelwr@google.com
		dangittik@google.com
		hackbod@google.com
		ogunwale@google.com
		santoscordon@google.com

		per-file ColorDisplayService.java=christyfranks@google.com