OSDN Git Service

Merge "IpSecService: Actually throw exception" am: 3eff26449f am: c5f089e6d5
authorAndreas Gampe <agampe@google.com>
Wed, 12 Jul 2017 01:43:13 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 01:43:13 +0000 (01:43 +0000)
am: d7c0357277

Change-Id: I9d5b81d6f62b6d8ff7561d908c6d61b4a21c7419


Trivial merge