Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/platform/packages/modules/DnsResolver into u14.0HEADu14.0

Android 14.0.0 Release 50 (AP2A.240605.024)

1 files changed, 5 insertions, 5 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index 41fb4475..82302dd1 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 package {
+    default_team: "trendy_team_fwk_core_networking",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "packages_modules_DnsResolver_license"
@@ -27,7 +27,7 @@ apex {
     manifest: "manifest.json",
     multilib: {
         first: {
-             native_shared_libs: ["libnetd_resolv"],
+            native_shared_libs: ["libnetd_resolv"],
         },
     },
     key: "com.android.resolv.key",
@@ -56,7 +56,7 @@ apex_key {
 }
 
 android_app_certificate {
-     name: "com.android.resolv.certificate",
-     // will use cert.pk8 and cert.x509.pem
-     certificate: "testcert",
+    name: "com.android.resolv.certificate",
+    // will use cert.pk8 and cert.x509.pem
+    certificate: "testcert",
 }