diff options
| author | 2023-07-17 23:40:03 +0000 | |
|---|---|---|
| committer | 2023-07-17 23:40:03 +0000 | |
| commit | c39ff6c3ae9766535704b45a89fe1833bf648f7e (patch) | |
| tree | 5967b8995d088723b28425ee8a44bccc909b04c1 /libs/androidfw/ApkAssets.cpp | |
| parent | 9621b5e28eb812d07b5ccc6129f04dac44777cd6 (diff) | |
| parent | 9b3260aa354f44e6d99e8b3af7b385bc2db586d0 (diff) | |
Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f85 am: 12af8505bb am: edf258add5 am: 9b3260aa35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640153
Change-Id: I4349ae00d33fdb7700ff5dd7aca086ab4f452e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
0 files changed, 0 insertions, 0 deletions