summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yan Yan <evitayan@google.com> 2025-01-23 12:15:47 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-23 12:15:47 -0800
commit1aabc9146d08248b58d2110513226e2918a896e2 (patch)
tree941d74c474db238fac9c3b8e1cd87f300d260e4a
parentafd0093ebf5c6aad86c5efa5b7843b2db44e21c8 (diff)
parentc5c8636a7f8de4697a73c05980dc77ce02bc71f3 (diff)
Merge "Jarjar IndentingPrintWriter with android.net.connectivity prefix" into main am: c5c8636a7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3459830 Change-Id: I50d62d87e6069946cd0133141d6cea05cc62f126 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt b/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt
index 7e27b24f749c..33287b7f3449 100644
--- a/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt
+++ b/packages/Vcn/framework-b/framework-vcn-jarjar-rules.txt
@@ -1,2 +1,3 @@
rule android.net.vcn.persistablebundleutils.** android.net.connectivity.android.net.vcn.persistablebundleutils.@1
-rule android.net.vcn.util.** android.net.connectivity.android.net.vcn.util.@1 \ No newline at end of file
+rule android.net.vcn.util.** android.net.connectivity.android.net.vcn.util.@1
+rule android.util.IndentingPrintWriter android.net.connectivity.android.util.IndentingPrintWriter \ No newline at end of file