| commit | c35ca6de375a1a17a3e070f85e7cf15272d92181 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Thu Oct 19 17:48:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 17:48:53 2017 +0000 |
| tree | fba948329afb4f64a3939cdf8cbd1c4b25746ed9 | |
| parent | 4b11fce4a44721cebe207a92ae57f3fadc62d20b [diff] | |
| parent | 9c6f24d1ee8e2b440ec70262f6c5c0d9a7237e78 [diff] |
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024 am: f92bfc3b77 am: 9c6f24d1ee Change-Id: Ie9a43c7f0519a2d7ac3326944608190503804483