OSDN Git Service

Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e am: f2074ea62a
authornharold <nharold@google.com>
Wed, 17 Jan 2018 10:07:33 +0000 (10:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Jan 2018 10:07:33 +0000 (10:07 +0000)
commit1ff0770d7653c5451019f7a69cb8eacb3ffe6e5c
tree0e413b050bba6c53af1c9e81dda53c948e1cd0fe
parent55d72e1c449ef01910fce8b9ebd8c98d610619be
parentc6021f02b5630b9a3248145b6a915ea5b9361cfd
Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e am: f2074ea62a
am: c6021f02b5

Change-Id: I2a90cf423a3ac9a0526831ef767ad019e7be053c