| commit | 05fa7073b9e138460729d103a73863904558ce7d | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Oct 16 22:52:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 16 22:52:03 2020 +0000 |
| tree | 639f5d6fd1a982bb2d64225cce8dd9d58f545e7d | |
| parent | 6baa1bf14765626ddba99ec1230347c669b811c1 [diff] | |
| parent | 3a07def46db1c00594d8182037ef2f3164b5c916 [diff] |
Merge changes from topic "new-ipsec-api" am: 3a07def46d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774