| commit | de2d7bef3be6e8530fd3ab0d806d987c08f53831 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 16 08:46:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 16 08:46:05 2021 +0000 |
| tree | 43e62ae3bd3c8b7b6b162243f43a164e234957e6 | |
| parent | 183446138737ef6dfc383d3ea9a456998d926d5e [diff] | |
| parent | c162fc297f2b80fdf0a8aa4b9ccf2423769031ac [diff] |
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703 Change-Id: Ib43879926b0b6789025ab2360c8dc0de1f28090f