tree 9f735a2f50ef10d24a8539ff148a254b61b44723
parent 4184b44a2a06c17c52f21c904cd06c31c60d5241
parent a575bce0edc89d186a5dda9e38baccd9b0c6f6a3
author TreeHugger Robot <treehugger-gerrit@google.com> 1625137361 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625137361 +0000

[automerger skipped] Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed -s ours

am skip reason: Merged-In Idae1042cfb454cc97b9b103587f11bc0700e0787 with SHA-1 3004f0d8d9 is already in history

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

Change-Id: I50aaf9f2abe8b6be6decf3bc8eda8c385004651f