Commit bb6f8329 authored Aug 22, 2019 by Santos Cordon

resolve merge conflicts of bd592e04 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9819adf76d6c96c54a02670a1d601a329003eb12

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