summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2023-08-29 21:50:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-29 21:50:35 +0000
commit3ab65f603340ad6b6e8943aeee3cb26bb9f34aed (patch)
tree16e6637e226f39a4da9fda9f697649a728a1b4b3 /libs/androidfw/AssetManager2.cpp
parentf0c63e8c653766438ab5c9c9760dfda406976fcd (diff)
parentcf75675add79eedca6e649296e49b982740aec15 (diff)
[automerger skipped] Merge "Move setHasTopUi to the background" into udc-qpr-dev am: 3e4bbf4a59 am: cf75675add -s ours
am skip reason: Merged-In Ib29c49e5dca9f33e755be4f2a38deacaa1d344e3 with SHA-1 52fc18adfa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24526358 Change-Id: Id3da11761ef6a7ec5e38a43c78754de733a4bea1 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