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