diff options
| author | 2023-07-18 00:23:49 +0000 | |
|---|---|---|
| committer | 2023-07-18 00:23:49 +0000 | |
| commit | 59f363b874eb0d8dda46f1b4e48538bb9be361d5 (patch) | |
| tree | 889a8f9a72431b30a651bafab56082f9cf05c904 /tools/aapt2/ResourceUtils.cpp | |
| parent | 066c66d6b47987cd2f1060e620ab1e09bc1af46b (diff) | |
| parent | c39ff6c3ae9766535704b45a89fe1833bf648f7e (diff) | |
Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f85 am: 12af8505bb am: edf258add5 am: 9b3260aa35 am: c39ff6c3ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640153
Change-Id: I01756c309219c177390b6adaa030220c87bb9c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions