| commit | cf5c2e67d30d64b0fbd891d6396ee4323d77c797 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 12:28:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 12:28:57 2023 +0000 |
| tree | ca913e6679e2077ad292f63db766796b68f75cb8 | |
| parent | 88f71ee9d25b60eaef1c9fac4f69d7623bf38865 [diff] | |
| parent | 9307d8d3a99b3cad34e3a35bb23c4ded9567fb2f [diff] |
Merge "Merge "[content-capture] owners files updates" am: 7e5966f01e am: 197fe45fce am: ff75c56051" into udc-dev-plus-aosp am: 9307d8d3a9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2595033 Change-Id: I101eb45291bf1805aed9593b33cc2bc2cc667618 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