summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2022-09-22 23:06:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-22 23:06:06 +0000
commitffc0522e908b7f477481863443652134612eb80d (patch)
tree36868bac42061bc394688cd601890ffcd509ef6c /libs/androidfw/AssetsProvider.cpp
parent590d9e3129b6e476c8d9e7eeb2f1eedfa0290bb5 (diff)
parentbe4bddc7da226e6444b184257f62c6f065d3b940 (diff)
Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859 Change-Id: I87b4fc0c306bade25faf9f68d05e489157aa7308 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