diff options
| author | 2022-09-02 13:40:14 +0000 | |
|---|---|---|
| committer | 2022-09-02 13:40:14 +0000 | |
| commit | fc24e0777bfe3137482785d29c1dc453aa60b8c5 (patch) | |
| tree | 1d8fcfb0afafdb6119c17b4272e027a5dc7b0620 /libs/androidfw/AssetsProvider.cpp | |
| parent | fc3adb942d746562aaca74dbf0bad673f5cc6619 (diff) | |
| parent | fea2f221eddcd546fc7b09743061456f3accb512 (diff) | |
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050 am: fea2f221ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896
Change-Id: I57c9d20845e2080a0cb9c63975fe1d4e1ca18a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions