tree 51e867770120ee99841326dbf2fc0966ce0090f0
parent ffdf092a77c6f6c8998394405d43f22ae54dfede
parent 7ae1e84f61f18d88c7db878c75f04fab0bd81ae9
author Andreas Gampe <agampe@google.com> 1546887179 -0800
committer android-build-merger <android-build-merger@google.com> 1546887179 -0800

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

Change-Id: I3b0d7800b94f7f00c42da8d1206cb026ac5c7a2d