tree 90142d1051c4a343a6ffb03147302b13bc877283
parent c31debe0376ff5e8f5d05345c85404445f358c86
parent bd3756122622f39cef444bd0cc471394f1c03e11
author Andreas Gampe <agampe@google.com> 1546886234 -0800
committer android-build-merger <android-build-merger@google.com> 1546886234 -0800

Merge "NetworkPolicy: Replace fake allLocks" am: 1afa2c413e
am: bd37561226

Change-Id: I1e77ef4a361d7167c1336fb15563fbb036463713