| commit | 4cddef19b10bdcebe1e53c42fc2912f19e22e5e4 | [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 | 777ffab2be381cbd7639ba7d617f5273f36c7a16 | |
| parent | 93a785bd6b25ba2c5f58c5624e68fbdfcb5b519f [diff] | |
| parent | cb5aed6518265b15a23b2b552d942f1a3a30cfb6 [diff] |
Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I45530694608909ddbb21d037cc3302130d8140c7