OSDN Git Service

Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f
authornharold <nharold@google.com>
Wed, 4 Oct 2017 20:35:20 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Oct 2017 20:35:20 +0000 (20:35 +0000)
commit4e793fd0b5165204426fb4dfffc70ab8789caab3
tree7f7bf726ede54fce487babdfd58e78cc58beeb2c
parent5dfce858ea04b7e5ec12e405a82242713fdd8aa6
parentae61e0c6e82c187c8fabf5a40c0bffa8f1923215
Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f
am: ae61e0c6e8

Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd