OSDN Git Service

Merge "Remove return value of ipSecAddSecurityAssociation" am: cd5c1161ab
authorDi Lu <ludi@google.com>
Wed, 12 Jul 2017 04:08:24 +0000 (04:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 04:08:24 +0000 (04:08 +0000)
am: 38e72983a5

Change-Id: I08b1498e05321b8cda04f56d07a0a5f50260d7d2


Trivial merge