summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2021-01-07 21:17:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-07 21:17:59 +0000
commitdd9753cfa838c1f9cf904bf8fa34d838f71ffbc0 (patch)
tree9ef608d8686fc2c4c8e072db49eb56f1400770cd
parentc46ce88a134de45e685719436876e42ed5ac44d4 (diff)
parent1a63689647fa5a274687c29f98013d956f3d0aeb (diff)
Merge "Repackage vcn utils in frameworks-minus-apex" am: 073452a700 am: 1a63689647
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539684 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec15fe0ab4611cb22079d59fd9e6291b88fb17a
-rw-r--r--framework-jarjar-rules.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt
index d8af726ffa72..52ee63a15a63 100644
--- a/framework-jarjar-rules.txt
+++ b/framework-jarjar-rules.txt
@@ -1,2 +1,3 @@
rule android.hidl.** android.internal.hidl.@1
rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1
+rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1