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 /native | |
| 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 'native')
| -rw-r--r-- | native/android/aidl/com/android/internal/compat/OWNERS | 1 | ||||
| -rw-r--r-- | native/graphics/OWNERS | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/native/android/aidl/com/android/internal/compat/OWNERS b/native/android/aidl/com/android/internal/compat/OWNERS new file mode 100644 index 000000000000..f8c3520e9fa8 --- /dev/null +++ b/native/android/aidl/com/android/internal/compat/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/compat/OWNERS diff --git a/native/graphics/OWNERS b/native/graphics/OWNERS new file mode 100644 index 000000000000..a6d1bc37d27d --- /dev/null +++ b/native/graphics/OWNERS @@ -0,0 +1 @@ +include /core/java/android/graphics/OWNERS |