| commit | 7a52d5a3eb6579db8312faa9eeafd2610a4ee9e9 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Thu Apr 22 09:18:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 09:18:06 2021 +0000 |
| tree | 11e743cc55e4cc708b0eaaa76debd61410f12486 | |
| parent | e80e82bb67597b67352fcac16cce5ff56d986310 [diff] | |
| parent | bc545c8a8a26d749fc0ed0f5f2e521517147c28a [diff] |
Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997 Change-Id: I40cbcb74cdfa95357827675fd1ace10b9fa1586b