summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-08-07 23:17:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-07 23:17:17 +0000
commit28c0e5cc000bde8befd5c85dca0de5eb1055297b (patch)
tree490b50bf3102c8d1b832a07d232653cdfb40e4d5 /libs/androidfw/ObbFile.cpp
parent93591d0182cfa1002e853e3a75ab5879bbec0573 (diff)
parenta8a801a42d871db2752332b16783faace6d30039 (diff)
[automerger skipped] Merge "Revert "Fix user switcher flicker."" into udc-dev am: adf330a1a7 am: 9f63882015 am: a8a801a42d -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: I05c295e457caf9b92e32c04805228d9ba07589a6 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