OSDN Git Service

Merge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04
authornharold <nharold@google.com>
Tue, 15 May 2018 04:59:55 +0000 (21:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 04:59:55 +0000 (21:59 -0700)
commitf9b0abb6c8f44c0536d1256fd9f1844624f06b7e
treec51ad53f7c9aec5f943b0f960efc8f2b2cf571c1
parentf8ac1fd83ccd57c1b42dc0545670885ad59a5b90
parente651d67bcb3a6444358d702857a16cf1f46cbf79
Merge "Use INetd Constant for IpSec Interface Prefix" am: 05a16e8a04
am: e651d67bcb

Change-Id: I142689ec7f7b43e745580eea393130d84fe4e99b