tree 9731a1d1dc4f479a7f912f19982a598a37e4e548
parent 160a0e8c59f658403bf4c68031d4f1274c9e038a
parent 65cc4029f4e4f69d8d49fa8618a7f35c3a328fc4
author Robin Lee <rgl@google.com> 1489763498 +0000
committer android-build-merger <android-build-merger@google.com> 1489763498 +0000

Merge "Use NetdClient to exempt racoon sockets from VPN" am: e973da9ba4 am: f1182befa0
am: 65cc4029f4

Change-Id: Ia463931ce5d8cbf1ae72ebfdfe24c174f270d646