OSDN Git Service

Merge changes from topic "ipsec-sync-with-pi"
authornharold <nharold@google.com>
Fri, 8 Jun 2018 19:34:09 +0000 (12:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 19:34:09 +0000 (12:34 -0700)
am: b2749539c0

Change-Id: Ic91ed8f496163c560c6f1fd306bc74e5fecb61c2


Trivial merge