summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-29 01:58:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-29 01:58:01 +0000
commitd374b90c30110b6b8d29b93bc0ffb58ead93eee2 (patch)
tree1b338f61d2c68b5bf1dc8f45cac2f5fbeb713a19 /libs/androidfw/AssetManager2.cpp
parent4c8a5f053b8f8525e4cd08ed4e94dbfb8410d8a7 (diff)
parentb2d7a92d2c131dc29aa1d03ccfb03455f995ce54 (diff)
Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-dev am: c0a8347c20 am: b2d7a92d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108353 Change-Id: I3da0f576bce4ff031cb3a71ee215bbc3ec3c71c8 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