tree bd4f9eee5c87c950aa67a1aac5031c83257c846e
parent 491898c32589684de710af299afb8f20d563ed1f
parent 03f2c35fb984d88bcc9d55a9e085e78782c5516a
author Yan Yan <evitayan@google.com> 1606158041 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606158041 +0000

Merge "Make Callbacks and SaProposals public APIs" am: d4abbc76e8 am: 03f2c35fb9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1468265

Change-Id: Ie5972ad59a079b6cfdf52649165f91dd31129365