commit 2418c8745f1054fe5495c4771191621ade5c762f
author Benedict Wong <benedictwong@google.com> Tue Jun 14 16:48:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 14 16:48:37 2022 +0000
tree c86debf54f0f71eb3e99e45b9fd9ae025302f72b
parent 49cf892d4cb7360cb1e52a8eec7ddc3652424bed
parent 142f5d26959dd1e6363e08afa5001be1681222b1

Merge "Make setUnderlyingNetwork() non-final" am: 142f5d2695

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2124555

Change-Id: I8d79f3a4c2de564e193d41aae1ff72ba9b12114d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 76c5d5c..b3cae7c 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -134,11 +134,11 @@
     hidden_api: {
         max_target_r_low_priority: [
             "hiddenapi/hiddenapi-max-target-r-loprio.txt",
-        ],
+	],
         max_target_o_low_priority: [
             "hiddenapi/hiddenapi-max-target-o-low-priority.txt",
             "hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt",
-        ],
+	],
         unsupported: [
             "hiddenapi/hiddenapi-unsupported.txt",
             "hiddenapi/hiddenapi-unsupported-tiramisu.txt",