| commit | 461aeb46890701ab8af3e8285d24a6b6598d4e55 | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Thu Jan 25 07:49:59 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 25 07:49:59 2018 +0000 |
| tree | 400daad7300c854cccfc7dcfc24e03128b52945b | |
| parent | 16897eb4aa73fc9101b3f8b4d7bfbb4acdc97c4b [diff] | |
| parent | bbb4b05a64183e51b29d209a386afcd5d20578ea [diff] |
Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 am: bbb4b05a64 Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5