commit | b3e429038ba02f332f994bf91ccf94cf77f1df52 | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Sat Oct 17 00:09:24 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 17 00:09:24 2020 +0000 |
tree | 6c9fbeb7b2d9dbee032393a6cfc876961efed334 | |
parent | f3bc0f54c65b08b27dc4930d8273a047ae64fa6f [diff] | |
parent | 2a21eb344f7940e8b7ee587bc6bea8e7a9198653 [diff] |
Merge changes from topic "new-ipsec-api" am: ba60e86e5a am: 0b763c0a50 am: d3ed8d97c6 am: 2a21eb344f Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1406030 Change-Id: I00573d28f16271b17973291fe3428b716c397fbf