diff options
| author | 2022-09-02 13:10:42 +0000 | |
|---|---|---|
| committer | 2022-09-02 13:10:42 +0000 | |
| commit | fea2f221eddcd546fc7b09743061456f3accb512 (patch) | |
| tree | 96e0cee79f83505c421386d4d5458b5494805013 /libs/androidfw/AssetsProvider.cpp | |
| parent | 24c74234520a66e218854ffdf6cb3e64cf90b30c (diff) | |
| parent | a50c41b050cea7cb2cacc9bdc7411dca24052dea (diff) | |
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896
Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
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