| commit | f92bfc3b77bcff1adb456dd51bd799811e52a698 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Thu Oct 19 17:26:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 17:26:19 2017 +0000 |
| tree | 76f19aa1c32397dc93d1d2e9cdb6179e429f69d8 | |
| parent | 23c2a6578b88f8132a858614cde4112656e2bc0e [diff] | |
| parent | d3a57920248c0385d4063bc906b78c5a8bfec054 [diff] |
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024 Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18