summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-08-07 22:35:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-07 22:35:02 +0000
commit93591d0182cfa1002e853e3a75ab5879bbec0573 (patch)
tree490b50bf3102c8d1b832a07d232653cdfb40e4d5 /libs/androidfw/ObbFile.cpp
parentdd78cfc46f7f7fa20c836578945673f1e0275d36 (diff)
parent020b260a3ca571b94759c8dc9138c4d4fa6ebc01 (diff)
[automerger skipped] Merge "Revert "Fix user switcher flicker."" into udc-dev am: adf330a1a7 am: 7498c0d9c5 am: 020b260a3c -s ours
am skip reason: Merged-In I1680d66336b5b6d5d1065c85ac4b09ca56e12d7a with SHA-1 dc072507d0 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24310817 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24328794 Change-Id: If8d7692b1be007f3e83023fa5b146c2d2857d4a9 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