tree e65d2ec1bbc5e7fb242302023594e1e5fa581016
parent 4d2dae8f0c5b1c88c40f2ab49bfff6f382598264
parent 43699e90f3221dfc7f5212126a257f256632675f
author nharold <nharold@google.com> 1518227160 +0000
committer android-build-merger <android-build-merger@google.com> 1518227160 +0000

Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
am: 43699e90f3

Change-Id: I1f286f0215ce88f947775ded0ddfbc8e0cd7bc55