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