tree b75c31a25399bdbb5fbc5c0b85edc7dbace87328
parent 44cc3636d3166a141f54178439a35ea5121f3382
parent a6bf6271e24174a2e67c065aef17db1ed364fa19
author Benedict Wong <benedictwong@google.com> 1537403034 -0700
committer android-build-merger <android-build-merger@google.com> 1537403034 -0700

Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS" am: 69c973b33f
am: a6bf6271e2

Change-Id: I6f6e3d2a43172459ef5bc88b6fc3d3fbbfd04a2f