summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-12 23:09:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 23:09:07 +0000
commit6700e754c6b06b2adc6472e7a3435efa887824b8 (patch)
tree843906150bd04a5b4a81ad8721c03865951e8de7 /libs/androidfw/ObbFile.cpp
parentb4ba04cff564c4d4dfca07f4997ba798f7b1cdb0 (diff)
parenta73dc89636c6af8567a5867ee32b7a2e592409b3 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-qpr-dev am: f55767f147 -s ours am: 7e7c4e9494 -s ours am: 8a1c804859 -s ours am: 4df19f8e0c -s ours am: a73dc89636 -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74cf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575088 Change-Id: Ia3a69f1397857d9b29f5001041f8bc3f5d14fbb6 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