diff options
| author | 2023-02-22 02:41:29 +0000 | |
|---|---|---|
| committer | 2023-02-22 02:41:29 +0000 | |
| commit | a20413602f429d847ef3471b39819984353413bf (patch) | |
| tree | b4fed5356511f7e68a3e0df1b665f5fb905c6a48 /libs/androidfw/StringPool.cpp | |
| parent | 7de5284717d52cc4674a1e77459d6053312b490a (diff) | |
| parent | 4ed216308c86a05d60475920d294e5727ac80147 (diff) | |
Merge "Have VPN use ESP_IP_VERSION and ESP_ENCAP_TYPE" am: 8c05531a44 am: e254b772c3 am: 4ed216308c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2440293
Change-Id: I60de5df25b65506dcd4563b216f7d35b1062804e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions