| commit | b9d614d4df1bdc24ec5549252c83c1c84e0b37b7 | [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 | e9c8bd98e5fc7a1e3b1b9ec0c2cd93c3a3c7dbf9 | |
| parent | 24dd1e9fb7172d7a2221fed40573f13c4cdad80b [diff] | |
| parent | b559164017b9ac6a34c890b1d1de574949ece1d3 [diff] |
Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 am: bbb4b05a64 Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5