diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2020-12-08 10:57:50 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2020-12-08 11:01:05 -0700 |
| commit | 0ab700763113fa2af53608fb6f7e3d78b4d3d75b (patch) | |
| tree | 62921ad999ca8e608d7bdc2d15bb1bb262d58484 /config | |
| parent | 0ace970e1997c91b1b105eb3e326963bc04164d3 (diff) | |
| parent | 358f0d4fc8c248498cf113c41e043877a14e89a1 (diff) | |
resolve merge conflicts of 358f0d4fc8c248498cf113c41e043877a14e89a1 to master
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
Diffstat (limited to 'config')
| -rw-r--r-- | config/OWNERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/OWNERS b/config/OWNERS index 3d4924df3462..d59c6f2d72ba 100644 --- a/config/OWNERS +++ b/config/OWNERS @@ -1,4 +1,7 @@ +include /ZYGOTE_OWNERS + # compat-team@ for changes to hiddenapi files + per-file hiddenapi-* = andreionea@google.com, mathewi@google.com, satayev@google.com # Escalations: |