tree b7ad6f31b1e6b108aeaffd47d745a405e63eed63
parent 31f805c90a05fc762b71293b2e3201771f74960a
parent 0729213b92b02731566d1058e053f7cdae894b7a
author Max Weninger <max.weninger@gmail.com> 1605102978 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> 1605102978 +0100

Merge "manifest: sync libnfnetlink and libnetfilter_conntrack" into android-11