| commit | cb5aed6518265b15a23b2b552d942f1a3a30cfb6 | [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 | 9aefdfc2c72c0e93ef2d62e4457c5a100c4a442e | |
| parent | d44577e9e6ed71421c3ad98b9b5aba39297af682 [diff] | |
| parent | a80fb3bbe66c92460c867a88b0ca5d0cfd354b40 [diff] |
Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774