| commit | 5bfa80c83a83d1f7687d52faf4ba4a9b5ee15abf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 07 15:57:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 07 15:57:13 2022 +0000 |
| tree | a5424facdf2d0c8255b96e448b01d6b7edc6b571 | |
| parent | d4969617990559b35592dc75f6e1266c3a8dd6f4 [diff] | |
| parent | aac58ccfd7393a20f4c8b81a7ad3290ed5d44b5a [diff] |
Merge "Set mark on non-offloaded ingress clat traffic" am: 49bcf60592 am: aac58ccfd7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2052985 Change-Id: I225fa565bf14ba79dfabb5570bb0354d0f11daf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>