OSDN Git Service

Merge "Move Keepalive out of IpSecTransform.Builder"
authornharold <nharold@google.com>
Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)
commitbbb4b05a64183e51b29d209a386afcd5d20578ea
tree816def9251b93f1dc6c3b6abd2b5a8b47b1ce5c6
parent806f0191d40bf9cf9d49c918bbebfd7fb6e9f3e0
parentaf3fb3efe4869174b71d957c19435af4937f2be1
Merge "Move Keepalive out of IpSecTransform.Builder"
am: af3fb3efe4

Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604