tree c51ad53f7c9aec5f943b0f960efc8f2b2cf571c1
parent f8ac1fd83ccd57c1b42dc0545670885ad59a5b90
parent e651d67bcb3a6444358d702857a16cf1f46cbf79
author nharold <nharold@google.com> 1526360395 -0700
committer android-build-merger <android-build-merger@google.com> 1526360395 -0700

Merge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04
am: e651d67bcb

Change-Id: I142689ec7f7b43e745580eea393130d84fe4e99b