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

am: 6948bc8ce1

Change-Id: I14075dad9f3242425b11ff78ed74e87acaad289d
This commit is contained in:
Neil Fuller
2019-08-23 02:04:15 -07:00
committed by android-build-merger

View File

@@ -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