OSDN Git Service

Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e
authornharold <nharold@google.com>
Wed, 17 Jan 2018 09:53:37 +0000 (09:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Jan 2018 09:53:37 +0000 (09:53 +0000)
commitc6021f02b5630b9a3248145b6a915ea5b9361cfd
treeaf37986187d0abefe9d72a6300eb5a0ca385efef
parent02f8dcad8a90ee8ac28453a68ccf3081ea099e29
parentf2074ea62a35f82fd87420b3b42f243b34d4c401
Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e
am: f2074ea62a

Change-Id: I58fe595ff14e3ee6be5191171367e8a2f7fad6da