summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-12 22:05:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 22:05:52 +0000
commitdb5fd419486bdaf6c0895729ada3aed89eadff93 (patch)
tree6ab20b2bf434edbf0d510e496d12e88defc64938 /libs/androidfw/ObbFile.cpp
parent451fe4b849b75ff3e9b1298e9b3edf1f98e4803c (diff)
parent5c0a97a976f442dd1d3ba7db53170ed49a336373 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-qpr-dev am: f55767f147 -s ours am: 7e7c4e9494 -s ours am: 5c0a97a976 -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: Iad39d9a295e74f1c91c3cc79705dbca44decf77d 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