summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Gareth Vaughan <garethv@google.com> 2022-12-07 22:45:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-07 22:45:51 +0000
commit4db1d7ea8ae60baea4a04c1aadc663b389e092fa (patch)
tree713c75d08e36a7dacb9c697a76ba6f6c85658a24 /libs/androidfw/AssetsProvider.cpp
parent296e97d7f63241254cea997983380b3d4f547ecb (diff)
parent373bd79698023dbee0f19b01b4cb784c2f5fff91 (diff)
Merge "Fixing test that is breaking in some environments. Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success Bug: 252837119" am: cd2a855610 am: 373bd79698
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2328240 Change-Id: I17741a068419da00b7cc874c289fc94806edb26e 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