| commit | cde05e5133b80c0f412a6616eafa68949ce4afaa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 16 09:05:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 16 09:05:40 2021 +0000 |
| tree | 268ea5950f9aafa6be87d5b94c299f9a7035d70f | |
| parent | c85ade177fac09209396c0c1e8cea1c0e8ce2781 [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: I566869dbb5e14ced269e286597381533d6f92c1b