Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1

am: 2b52914445

Change-Id: I35325a500dea35edc9a323d7a01a77dd2bbeb26d
This commit is contained in:
Neil Fuller
2019-08-23 02:12:16 -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