Merge "Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2019-08-24 04:48:38 +00:00
committed by Android (Google) Code Review

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