diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-01 09:11:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 09:11:38 +0000 |
| commit | 3df5e7a725b9f4beb5501ebfba411d477bb63af9 (patch) | |
| tree | 7f2dfaf4151386b42db2c2b915a24aba22e3bede | |
| parent | 81fc3b61b8b0a4895ddc4385c2b3269a92fbb525 (diff) | |
| parent | 43c54b194ec583378b84e61b2be952dbee51fd3a (diff) | |
Merge "Fix jarjar rule for LocalLog" into rvc-dev am: 4e34267c2a am: 43c54b194e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12018738
Change-Id: I4a6ba5ea495d631c67075d8e0c1ca2528631b1d4
| -rw-r--r-- | jarjar-rules-shared.txt | 2 |
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 |