Commit 6948bc8c authored Aug 23, 2019 by Neil Fuller Committed by Android (Google) Code Review Aug 23, 2019

Merge "resolve merge conflicts of bd592e04 to...

Merge "resolve merge conflicts of bd592e04 to stage-aosp-master" into stage-aosp-master

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