| commit | 2580e7a9f1fccf9e3087a76b0591c4a5836ab3bf | [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 | 142418e659c7eacfa9dd5cce84755fbcdb61ef33 | |
| parent | 5ac12d9b416e3654d5d1e49c9264357b933ae713 [diff] | |
| parent | 46f82d282aef0dd7c96362bc5c70dc08930826d8 [diff] |
Merge changes from topic "new-ipsec-api" am: 46f82d282a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774