diff options
| author | 2019-08-23 08:48:14 +0000 | |
|---|---|---|
| committer | 2019-08-23 08:48:14 +0000 | |
| commit | 6948bc8ce188f141630a8db169b955bb96ffea85 (patch) | |
| tree | 7566964a98363bc18cf0f89dd9558674772a9783 | |
| parent | d3f8bbc6c0974d4fb83199ed867cc7635028f3eb (diff) | |
| parent | bb6f8329a0a242908dc0b65b031aecc415e5c32a (diff) | |
Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master
| -rw-r--r-- | services/core/java/com/android/server/display/OWNERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/display/OWNERS b/services/core/java/com/android/server/display/OWNERS index 25cb5ae0891a..09d96be43a43 100644 --- a/services/core/java/com/android/server/display/OWNERS +++ b/services/core/java/com/android/server/display/OWNERS @@ -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 |