summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-07 23:02:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 23:02:31 +0000
commit3c36234a77401bcc74b4746d33be291ee7a6d988 (patch)
tree7ee669e954b2d2eac975a35461824230e67f956b /libs/androidfw/ObbFile.cpp
parentec25c89322c0e5ef2b43d08a5968977128565de8 (diff)
parenteebaf4b200f39a06a44956e8656921eb1b0f52a5 (diff)
[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df16f am: b928a088ea -s ours am: 9dfc2e9801 -s ours am: eebaf4b200 -s ours
am skip reason: Merged-In I7a2e85c703d2758f89b0c06d898f9423d6764444 with SHA-1 76524da868 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681253 Change-Id: I7a51f9098f47b9ba23aabbe00391d25d2735aadc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions