| commit | 0d3596d4f77d07549af54ec311cf5ac99745fc1b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 17 16:16:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 17 16:16:28 2021 +0000 |
| tree | a7cc808a9eb0fdaddf7193396eb53d15a9b1a437 | |
| parent | 5b0021764ab74ae08f0e977b30d1ec5db996ea20 [diff] | |
| parent | cde05e5133b80c0f412a6616eafa68949ce4afaa [diff] |
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cde05e5133 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703 Change-Id: Iecbed59bf7dcc249b288164e43d5357eff3f94f2