summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-07-01 09:00:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-01 09:00:32 +0000
commit43c54b194ec583378b84e61b2be952dbee51fd3a (patch)
tree7098b8d11ccb0a75c125bb66ecba7cf575856d9e
parentb8059b4e9103e9902b1496052c140e317c801b31 (diff)
parent4e34267c2a51efc85e367229e8f60f45e49a31da (diff)
Merge "Fix jarjar rule for LocalLog" into rvc-dev am: 4e34267c2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12018738 Change-Id: I146611e7ae6b8134b545ba3facfd1056b50e195b
-rw-r--r--jarjar-rules-shared.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 438fc61..048c976 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -11,4 +11,4 @@ rule com.android.net.module.util.** com.android.networkstack.util.@1
# TODO: move DhcpResults into services.net and delete from here
rule android.net.DhcpResultsParcelable* @0
rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1
-rule android.net.LocalLog* android.net.networkstack.LocalLog@1
+rule android.util.LocalLog* android.net.networkstack.util.LocalLog@1