| commit | af9772371c0ba94ed1efcf87897fc92262b06384 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Sat Oct 17 00:09:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 17 00:09:20 2020 +0000 |
| tree | 21c6f53c0c1100916f440a2336d19593148050b9 | |
| parent | 0baf1b20e1ad2dfdd4e3f917ca0ee1c315a11503 [diff] | |
| parent | 021a46ff4b94402e6ce977b45715720c81c79d9a [diff] |
Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1 am: f769e1ecb0 am: 021a46ff4b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I18748127d0c97d9473c96678d556b03ad6048808