OSDN Git Service

Merge changes from topic "re-enable-ipsec" am: 680525c742
authornharold <nharold@google.com>
Tue, 26 Sep 2017 22:24:02 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 22:24:02 +0000 (22:24 +0000)
commit80107540bb70914f8133932c39ff77a9fb39c3ee
tree8e2c2976b20249ad010ffe9face5905a47ac88e6
parent686a8282bbdbc57d67d0ec911d8bcdb0ae08c66c
parent8d306cd78a2273c8d307c65530cd23541901a3ae
Merge changes from topic "re-enable-ipsec" am: 680525c742
am: 8d306cd78a

Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
api/system-current.txt