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