OSDN Git Service

Merge changes from topic 'ipsec-transport-impl'
authornharold <nharold@google.com>
Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)
commitf983d8908337a3b415391efd4ed78ed6836b051a
tree3dc220e34d432e4d058383212efe582ea22d1c1a
parent5eaf5393a5b8b1af17bfd9856b3b003fba617eb6
parent464dc5c07eb5588f7f3a18941d922f2ca84cd239
Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f