commit | f59a3d1352f74fbce3719b9035b346935e7debd9 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 06 12:33:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 06 12:33:12 2020 +0000 |
tree | 2d19e758a67dd6d627662dab0b4b935e282cd629 | |
parent | 3192fc4f931aa10fcd0401a7f13a8a7bfa8d3d1d [diff] | |
parent | 2299a3e35f1c0e8ee770e4fea5fcb6abbdbc8c5b [diff] |
Merge "[NFCT.NS.3] Add netfilter conntrack event monitor" am: 9eefc7422a am: 2299a3e35f Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1462083 Change-Id: I59a8fd9beb1204de16beccdda9ee374233957ed6