diff options
| author | 2020-12-08 10:57:50 -0700 | |
|---|---|---|
| committer | 2020-12-08 11:01:05 -0700 | |
| commit | 0ab700763113fa2af53608fb6f7e3d78b4d3d75b (patch) | |
| tree | 62921ad999ca8e608d7bdc2d15bb1bb262d58484 /services/robotests/src | |
| 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 'services/robotests/src')
| -rw-r--r-- | services/robotests/src/com/android/server/backup/OWNERS | 1 | ||||
| -rw-r--r-- | services/robotests/src/com/android/server/pm/OWNERS | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/robotests/src/com/android/server/backup/OWNERS b/services/robotests/src/com/android/server/backup/OWNERS new file mode 100644 index 000000000000..d99779e3d9da --- /dev/null +++ b/services/robotests/src/com/android/server/backup/OWNERS @@ -0,0 +1 @@ +include /services/backup/OWNERS diff --git a/services/robotests/src/com/android/server/pm/OWNERS b/services/robotests/src/com/android/server/pm/OWNERS new file mode 100644 index 000000000000..d825dfd7cf00 --- /dev/null +++ b/services/robotests/src/com/android/server/pm/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/pm/OWNERS |