commit | f5092a106b30fb81e2d05e4abe4fbaed57d856e0 | [log] [tgz] |
---|---|---|
author | nharold <nharold@google.com> | Thu Jan 25 07:59:57 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 25 07:59:57 2018 +0000 |
tree | cb245112b35324e721b9e5f6ac97cb33c0ee45ef | |
parent | 5a15b7df1fb0c43430df3908109b934d57f27a1d [diff] | |
parent | 461aeb46890701ab8af3e8285d24a6b6598d4e55 [diff] |
Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 am: bbb4b05a64 am: 461aeb4689 Change-Id: Ic554e34d9b16f522156bc7e8b176f96693e8e32c