tree cf5437d848e2935b018df013822cc22f9229630c
parent 071072f33ece3854c4b2282b1deb9296fec2b7a4
parent b33fdcf59cdc83fc0881bc8a9c91c12d354aca5e
author Andreas Gampe <agampe@google.com> 1499824213 +0000
committer android-build-merger <android-build-merger@google.com> 1499824213 +0000

Merge "IpSecService: Actually throw exception" am: 3eff26449f am: c5f089e6d5 am: d7c0357277
am: b33fdcf59c

Change-Id: Ic3440c4f933725be28d5cd2b86bebc2950206f63