| commit | 9271641499127e9a2177eaef1fc983053cfda8a1 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 13:15:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 13:15:12 2023 +0000 |
| tree | dfd91497c4f7c0dfd60731498c2dba56d6b310cb | |
| parent | 36503cd7d3d18b643d093a569030c5314435ad2b [diff] | |
| parent | 58eb96bb4f9914d6abee6d125c7cdaed882576e7 [diff] |
Merge "Merge "[content-capture] owners files updates" am: 7e5966f01e am: 197fe45fce am: ff75c56051" into udc-dev-plus-aosp am: 9307d8d3a9 am: cf5c2e67d3 am: 58eb96bb4f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2595033 Change-Id: I070d8c326398eb6f19786dec7b4b74bd948ab1de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/view/contentcapture/OWNERS b/core/java/android/view/contentcapture/OWNERS index 43be4f6..e4b0952 100644 --- a/core/java/android/view/contentcapture/OWNERS +++ b/core/java/android/view/contentcapture/OWNERS
@@ -1,4 +1,5 @@ # Bug component: 544200 hackz@google.com -volnov@google.com \ No newline at end of file +shivanker@google.com +volnov@google.com
diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/OWNERS b/services/tests/servicestests/src/com/android/server/contentprotection/OWNERS new file mode 100644 index 0000000..24561c5 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentprotection/OWNERS
@@ -0,0 +1,3 @@ +# Bug component: 544200 + +include /core/java/android/view/contentcapture/OWNERS