tree e877012a619efe80d9e863348fac60ba063eb229
parent 3598f1ee7e15ac546e65c84bcfdd77194db72c4f
parent c807aa96e03fe642283dc781c6ebe594daaf3dd4
author Maciej Żenczykowski <maze@google.com> 1644613302 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644613302 +0000

Merge "Fix wrong nla_type for matchall" am: c807aa96e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1981849

Change-Id: I8f39d06d104b6014a95e059415422af21837dd20