commit | bbb4b05a64183e51b29d209a386afcd5d20578ea | [log] [tgz] |
---|---|---|
author | nharold <nharold@google.com> | Thu Jan 25 07:37:00 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 25 07:37:00 2018 +0000 |
tree | 816def9251b93f1dc6c3b6abd2b5a8b47b1ce5c6 | |
parent | 806f0191d40bf9cf9d49c918bbebfd7fb6e9f3e0 [diff] | |
parent | af3fb3efe4869174b71d957c19435af4937f2be1 [diff] |
Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604