| commit | 3e46bb624129b7182c7d44567c0ba8aef4282b45 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Feb 10 12:57:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 10 12:57:56 2022 +0000 |
| tree | 5a32889c74c91928015256c5947cbdfbb191dfef | |
| parent | a531035a8c6d022df0d0f4e014da4f3262e83ab4 [diff] | |
| parent | 0de10ef08959151f7106b4fb6e96d1b0ecaf3327 [diff] |
[automerger skipped] Merge "Split out the ipsec API surface and use framework-connectivity-tiramisu" am: 5edd77be5c am: aadb46c41f am: b37292f226 am: 0de10ef089 -s ours am skip reason: Merged-In I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca with SHA-1 131a866384 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960193 Change-Id: I4fdbc44085997514392d3f87b359b35cc9003191