| commit | c20e9c8b4befd2334b038d4dcc44d63b0f89cec5 | [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 | 9e8893ebd65ede8be17548b995bf0e76ca41638e | |
| parent | 49f46b8e74c7103d6cec57293b508ab1cb624b37 [diff] | |
| parent | b9d614d4df1bdc24ec5549252c83c1c84e0b37b7 [diff] |
Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 am: bbb4b05a64 am: b9d614d4df Change-Id: Ic554e34d9b16f522156bc7e8b176f96693e8e32c