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 /apct-tests/perftests | |
| 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 'apct-tests/perftests')
| -rw-r--r-- | apct-tests/perftests/OWNERS | 2 | ||||
| -rw-r--r-- | apct-tests/perftests/autofill/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/blobstore/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/contentcapture/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/core/apps/overlay/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/core/src/android/accounts/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/core/src/android/database/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/inputmethod/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/packagemanager/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/textclassifier/OWNERS | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/windowmanager/OWNERS | 1 |
11 files changed, 12 insertions, 0 deletions
diff --git a/apct-tests/perftests/OWNERS b/apct-tests/perftests/OWNERS new file mode 100644 index 000000000000..a060ad9a5a7e --- /dev/null +++ b/apct-tests/perftests/OWNERS @@ -0,0 +1,2 @@ +timmurray@google.com +philipcuadra@google.com diff --git a/apct-tests/perftests/autofill/OWNERS b/apct-tests/perftests/autofill/OWNERS new file mode 100644 index 000000000000..c52751d79227 --- /dev/null +++ b/apct-tests/perftests/autofill/OWNERS @@ -0,0 +1 @@ +include /core/java/android/service/autofill/OWNERS diff --git a/apct-tests/perftests/blobstore/OWNERS b/apct-tests/perftests/blobstore/OWNERS new file mode 100644 index 000000000000..65bb6b8a5423 --- /dev/null +++ b/apct-tests/perftests/blobstore/OWNERS @@ -0,0 +1 @@ +include /apex/blobstore/OWNERS diff --git a/apct-tests/perftests/contentcapture/OWNERS b/apct-tests/perftests/contentcapture/OWNERS new file mode 100644 index 000000000000..a28e00a5c490 --- /dev/null +++ b/apct-tests/perftests/contentcapture/OWNERS @@ -0,0 +1 @@ +include /core/java/android/service/contentcapture/OWNERS diff --git a/apct-tests/perftests/core/apps/overlay/OWNERS b/apct-tests/perftests/core/apps/overlay/OWNERS new file mode 100644 index 000000000000..afb98d416762 --- /dev/null +++ b/apct-tests/perftests/core/apps/overlay/OWNERS @@ -0,0 +1 @@ +include /core/java/android/content/om/OWNERS diff --git a/apct-tests/perftests/core/src/android/accounts/OWNERS b/apct-tests/perftests/core/src/android/accounts/OWNERS new file mode 100644 index 000000000000..df1b4f432cd6 --- /dev/null +++ b/apct-tests/perftests/core/src/android/accounts/OWNERS @@ -0,0 +1 @@ +include /core/java/android/accounts/OWNERS diff --git a/apct-tests/perftests/core/src/android/database/OWNERS b/apct-tests/perftests/core/src/android/database/OWNERS new file mode 100644 index 000000000000..bb9a2ca27ba9 --- /dev/null +++ b/apct-tests/perftests/core/src/android/database/OWNERS @@ -0,0 +1 @@ +include /core/java/android/database/OWNERS diff --git a/apct-tests/perftests/inputmethod/OWNERS b/apct-tests/perftests/inputmethod/OWNERS new file mode 100644 index 000000000000..5deb2ce8f24b --- /dev/null +++ b/apct-tests/perftests/inputmethod/OWNERS @@ -0,0 +1 @@ +include /core/java/android/view/inputmethod/OWNERS diff --git a/apct-tests/perftests/packagemanager/OWNERS b/apct-tests/perftests/packagemanager/OWNERS new file mode 100644 index 000000000000..d825dfd7cf00 --- /dev/null +++ b/apct-tests/perftests/packagemanager/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/pm/OWNERS diff --git a/apct-tests/perftests/textclassifier/OWNERS b/apct-tests/perftests/textclassifier/OWNERS new file mode 100644 index 000000000000..46b3cb8824a0 --- /dev/null +++ b/apct-tests/perftests/textclassifier/OWNERS @@ -0,0 +1 @@ +include /core/java/android/service/textclassifier/OWNERS diff --git a/apct-tests/perftests/windowmanager/OWNERS b/apct-tests/perftests/windowmanager/OWNERS new file mode 100644 index 000000000000..0862c05e0ee4 --- /dev/null +++ b/apct-tests/perftests/windowmanager/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/wm/OWNERS |