diff options
| author | 2023-08-28 12:20:49 +0000 | |
|---|---|---|
| committer | 2023-08-28 12:20:49 +0000 | |
| commit | cedc246e86a560b2826db472144029406bd12a3f (patch) | |
| tree | 2d5034a317d394917d5fb154b963b7ed3e149238 /tools/aapt/StringPool.cpp | |
| parent | 63979ebbb2111b6837994054471a40e7ed99223e (diff) | |
| parent | 06c1c3ed214c491cac74de35bbf07fd1d2dd1e10 (diff) | |
Merge "Set underlying network as soon as VPN tries using the network" into main am: 0b3c59e37e am: 87fa06b4c8 am: 06c1c3ed21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719273
Change-Id: I3f5a5122e9041fd9613c7fb40f9657a30d909267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions