Commit 6653f2b2 authored Aug 23, 2019 by Neil Fuller Committed by android-build-merger Aug 23, 2019

Merge "resolve merge conflicts of bd592e04 to...

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

Change-Id: Idcee9696bdb3cd2e65809f44eff0f8ff77782d27

parents 85f6ce6d 7a5ba3f5

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