| commit | c394bc20895d8dea77675856dce72c830d4b7531 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 16 09:49:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 16 09:49:12 2021 +0000 |
| tree | 493f814bf2f7982cd1e365c3e1ce22cc2b098351 | |
| parent | 9ade18325638d72fdb3cdd8e7d1f8c17138f2b6a [diff] | |
| parent | cf31e5cbe4e7d33b8ecd4164b10b434ae7fd959b [diff] |
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cf31e5cbe4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703 Change-Id: Ic5b03b49e605057a048100fcc1e5b22b158e47c3