| commit | f769e1ecb0e7626b2712cd5546940a22467c0e4b | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Oct 16 23:07:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 16 23:07:31 2020 +0000 |
| tree | 142418e659c7eacfa9dd5cce84755fbcdb61ef33 | |
| parent | 851900ba6c2db7a3ee45cc1d50e02516b9e1b6f0 [diff] | |
| parent | 2580e7a9f1fccf9e3087a76b0591c4a5836ab3bf [diff] |
Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I45530694608909ddbb21d037cc3302130d8140c7