| commit | 4d57a2c078109b314beb5a0e862d3c1b5ed8c098 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 23 00:34:24 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 23 00:34:24 2024 +0000 |
| tree | d2df095818217be4aa3a53998d4da4ea487e87a1 | |
| parent | 4b703892493c36e4f45c3c5255616f47f078c930 [diff] | |
| parent | db4533a98982460a85539dbd6cedca2bbbd77b31 [diff] |
Merge "[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into udc-dev am: 265baa61f4 am: 36e3011e35 -s ours" into main
diff --git a/omapi/aidl/vts/functional/AccessControlApp/Android.bp b/omapi/aidl/vts/functional/AccessControlApp/Android.bp index f03c3f6..57d75f5 100644 --- a/omapi/aidl/vts/functional/AccessControlApp/Android.bp +++ b/omapi/aidl/vts/functional/AccessControlApp/Android.bp
@@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_nfc", default_applicable_licenses: ["Android-Apache-2.0"], }
diff --git a/omapi/aidl/vts/functional/omapi/Android.bp b/omapi/aidl/vts/functional/omapi/Android.bp index c41479f..8ee55ff 100644 --- a/omapi/aidl/vts/functional/omapi/Android.bp +++ b/omapi/aidl/vts/functional/omapi/Android.bp
@@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_nfc", default_applicable_licenses: ["Android-Apache-2.0"], }