| commit | d8dbd83e6d9d7e9acb4f78b6bdd5cbbe930bbfcc | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Fri Nov 22 20:18:48 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 22 20:18:48 2019 -0800 |
| tree | ad8e17256d81cb1ba83ad00f296297a500891ca9 | |
| parent | 85cd7d9bc830fc2d05072dcd5a18d569d7dc6359 [diff] | |
| parent | bf9172deb4b76cd65d6546ce93e7f06758d07386 [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 Change-Id: I7407a74764628feeec04e5730df788e14fe2e5c6