commit 9361d76bc36b8cf3f51702e6b58750a0491ee16b
author Vadim Caen <caen@google.com> Fri Sep 29 17:19:49 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 29 17:19:49 2023 +0000
tree a5bf094e1653e9accf7923ac7e8844e66759819d
parent b63e63a28055906e1b5c2295f967194e6524dac4
parent 97d53d4ed2c60f5b4b64f8496ad96a1b661fc65f

Merge "Add VDM team as owner of the companion Android.bp file" into main

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index 6aef5ff..4f14c377 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -86,6 +86,7 @@
         "framework-media",
         "framework-mediaprovider",
         "framework-ondevicepersonalization",
+        "framework-pdf",
         "framework-permission",
         "framework-permission-s",
         "framework-scheduling",

core/java/android/nfc/TEST_MAPPING

diff --git a/core/java/android/nfc/TEST_MAPPING b/core/java/android/nfc/TEST_MAPPING
index 71ad687..5b5ea37 100644
--- a/core/java/android/nfc/TEST_MAPPING
+++ b/core/java/android/nfc/TEST_MAPPING
@@ -2,6 +2,9 @@
   "presubmit": [
     {
       "name": "NfcManagerTests"
+    },
+    {
+      "name": "CtsNfcTestCases"
     }
   ]
 }