commit | 76182b50f3cfa3bd22145ec2ebe6df93d8d42044 | [log] [tgz] |
---|---|---|
author | Benedict Wong <benedictwong@google.com> | Mon Nov 25 07:39:05 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 25 07:39:05 2019 -0800 |
tree | 6311a2ccc82387d14de8c21b0c0c9888e6c5a9b3 | |
parent | 49d64ab74eeb8ec30011bc7d4ea813a3cfff7db1 [diff] | |
parent | d8dbd83e6d9d7e9acb4f78b6bdd5cbbe930bbfcc [diff] |
Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" am: 091e420529 am: bf9172deb4 am: d8dbd83e6d Change-Id: Ibe3c628fd6b3449c22be9e101dec6aeb1cb23895