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)
commitef9f2740a790feceaa47a24b1a179e93c4ffb5e6
tree3542d598ffbf57a57a99942d718e4d8e2882cf40
parent1ff8f364d4af93a354b3b618e05cb849f388a10a
parentb2749539c05cfb296a5729fcba887057b9c94307
Merge changes from topic "ipsec-sync-with-pi"
am: b2749539c0

Change-Id: Ic91ed8f496163c560c6f1fd306bc74e5fecb61c2