diff options
| author | 2023-07-17 23:37:51 +0000 | |
|---|---|---|
| committer | 2023-07-17 23:37:51 +0000 | |
| commit | 9b3260aa354f44e6d99e8b3af7b385bc2db586d0 (patch) | |
| tree | e3ba38c6a6a26da69ffa23c4c50dc232f35663a1 /libs/androidfw/ApkAssets.cpp | |
| parent | f54f2445856b0304520b24771867b066e18ca352 (diff) | |
| parent | edf258add5d4bec384fd0d5bbab41d196e3a11bd (diff) | |
Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f85 am: 12af8505bb am: edf258add5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640153
Change-Id: I190abd46ddb9eed79692942fac85ae627b954efb
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