tree 41f2a6a189ee1d31c84c00726e1cc44f8848e242
parent 643dc6b82fd28abf34d9574fb68dcdd5b137d99a
parent 4894d0892655fd90378cf09e3670c10196d3ebf2
author Nucca Chen <nuccachen@google.com> 1600409570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600409570 +0000

Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: ca5a85bcb0 am: f2deca5759 am: 4894d08926

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189

Change-Id: I476365339384f18bf1e5b3d1509d92d3380fbe35