Commit 5e39293a authored Aug 23, 2019 by Neil Fuller Committed by android-build-merger Aug 23, 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
am: 1ff9dc99

Change-Id: Ic6cc5a29b02b7746fd9e55b3a5c803ffe097d91f

parents 38074236 1ff9dc99

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