| commit | 5d28ec6c7b8e768e177754a9baca625ff081fdbe | [log] [tgz] |
|---|---|---|
| author | Nucca Chen <nuccachen@google.com> | Wed Oct 28 09:20:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 28 09:20:00 2020 +0000 |
| tree | 3dadd738e19a88b14ec66d60c35b1d89f314ae2c | |
| parent | c244da48fdf31b193c83fc9a5e6316c94206a963 [diff] | |
| parent | 0eac88d0bbe312d25dbb6fb0a6fffeeb75430dd5 [diff] |
Merge changes from topic "nf-conntrack-for-tether-offload" am: eda2f56ad5 am: 0eac88d0bb Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1471589 Change-Id: Idbd52dc3f0426af61138a5b9066f5803e3774961