OSDN Git Service

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

Change-Id: I94e533d415e0afdbd4be72536ec667513a32f025


Trivial merge