| commit | 4ed216308c86a05d60475920d294e5727ac80147 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Wed Feb 22 02:37:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 22 02:37:17 2023 +0000 |
| tree | f83519405d7387a763bfbf6bc643ae5bda871a52 | |
| parent | 05f5ef746f3599d18e54d9764d6c0170f59bb435 [diff] | |
| parent | e254b772c3b669ff9c0e8ee7a00fceb2213d4de7 [diff] |
Merge "Have VPN use ESP_IP_VERSION and ESP_ENCAP_TYPE" am: 8c05531a44 am: e254b772c3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2440293 Change-Id: Ia9d8c4da0a5071d59dd92d49b563896eaa653bac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>