diff options
| author | 2025-02-11 14:46:59 -0800 | |
|---|---|---|
| committer | 2025-02-11 14:46:59 -0800 | |
| commit | f757160b429e6ee116d36ec9202f03497bbb6983 (patch) | |
| tree | d93c7365fba2da5d083ec96ac2e5674b9b34c702 | |
| parent | e069b132d943cd2893bd9e5ca3b4c197e681b41b (diff) | |
| parent | cde197cac4ab18d050f46cd6fcb168145ee3bd2a (diff) | |
Merge "Fix nfc owners location" into main am: a4df8f749c am: cde197cac4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3489591
Change-Id: I403f8d0c6771889b97480f6c856f8e0b10e28212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/svc/src/com/android/commands/svc/OWNERS | 2 | ||||
| -rw-r--r-- | core/proto/android/nfc/OWNERS | 2 | ||||
| -rw-r--r-- | nfc-extras/OWNERS | 2 | ||||
| -rw-r--r-- | omapi/OWNERS | 2 | ||||
| -rw-r--r-- | omapi/java/android/se/OWNERS | 2 | ||||
| -rw-r--r-- | omapi/java/android/se/omapi/OWNERS | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/cmds/svc/src/com/android/commands/svc/OWNERS b/cmds/svc/src/com/android/commands/svc/OWNERS index d5a5d7b3b858..a901dfdeddfb 100644 --- a/cmds/svc/src/com/android/commands/svc/OWNERS +++ b/cmds/svc/src/com/android/commands/svc/OWNERS @@ -1,2 +1,2 @@ # Bug component: 48448 -per-file NfcCommand.java = file:platform/packages/apps/Nfc:/OWNERS +per-file NfcCommand.java = file:platform/packages/modules/Nfc:/OWNERS diff --git a/core/proto/android/nfc/OWNERS b/core/proto/android/nfc/OWNERS index ca16721eacc1..36823aee4dbb 100644 --- a/core/proto/android/nfc/OWNERS +++ b/core/proto/android/nfc/OWNERS @@ -1 +1 @@ -include platform/packages/apps/Nfc:/OWNERS
\ No newline at end of file +include platform/packages/modules/Nfc:/OWNERS
\ No newline at end of file diff --git a/nfc-extras/OWNERS b/nfc-extras/OWNERS index 35e9713f5715..2b82bc8ad073 100644 --- a/nfc-extras/OWNERS +++ b/nfc-extras/OWNERS @@ -1,2 +1,2 @@ # Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS +include platform/packages/modules/Nfc:/OWNERS diff --git a/omapi/OWNERS b/omapi/OWNERS index 39c5c5bdeb09..375d643f7ed1 100644 --- a/omapi/OWNERS +++ b/omapi/OWNERS @@ -1,2 +1,2 @@ # Bug component: 456592 -include platform/packages/apps/Nfc:/OWNERS +include platform/packages/modules/Nfc:/OWNERS diff --git a/omapi/java/android/se/OWNERS b/omapi/java/android/se/OWNERS index 39c5c5bdeb09..375d643f7ed1 100644 --- a/omapi/java/android/se/OWNERS +++ b/omapi/java/android/se/OWNERS @@ -1,2 +1,2 @@ # Bug component: 456592 -include platform/packages/apps/Nfc:/OWNERS +include platform/packages/modules/Nfc:/OWNERS diff --git a/omapi/java/android/se/omapi/OWNERS b/omapi/java/android/se/omapi/OWNERS index 39c5c5bdeb09..375d643f7ed1 100644 --- a/omapi/java/android/se/omapi/OWNERS +++ b/omapi/java/android/se/omapi/OWNERS @@ -1,2 +1,2 @@ # Bug component: 456592 -include platform/packages/apps/Nfc:/OWNERS +include platform/packages/modules/Nfc:/OWNERS |