summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2022-09-02 12:36:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 12:36:28 +0000
commita50c41b050cea7cb2cacc9bdc7411dca24052dea (patch)
treebfcdb0e33bb4b51b9b72f0b5c32ce6ccdc38ce9b /libs/androidfw/AssetsProvider.cpp
parent35c2e10af3dbb5e19b26e8f1e7fc4ee359fb81c8 (diff)
parenta03fa63d1909c0089d54e7ad8e966d8c074eb340 (diff)
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896 Change-Id: Ie3910c0117a77413e6c59d02315590354b2a8447 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