summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Olivier Gaillard <gaillard@google.com> 2023-10-13 17:53:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-13 17:53:17 +0000
commit983645e4d4261de00cadb64bcec88f28a52f79d2 (patch)
tree35b215ba71852cead74cc216220c64f9f3cebf0d /libs/androidfw/AssetManager2.cpp
parentd8a0b498bd366f6eccbf080c6f276b7c9057a653 (diff)
parent540c36caff1bcb83254b9a077b46728eee5ab7e1 (diff)
Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b445 am: 154710d479 am: 3b84abdaef am: 0e75a92696 am: 540c36caff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: I22ec8f37fa8c773013bba38f8f5dd0add45fb77f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions