summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 03:04:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 03:04:16 +0000
commit07463dbd78625faf2957911b79afc80b0291457b (patch)
tree6c741b3b6fc898d62cd72612b78da6cf7ff53c59 /libs/androidfw/AssetsProvider.cpp
parentd39d3eb6ae1901102ce5f11512c87380110fd14b (diff)
parentb6d4fe1a993b1d483f01279b66c60a3e8b0f95e4 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d84452 -s ours am: 6c73f28cbc -s ours am: d39052c7be -s ours am: df85f263bc -s ours am: 09270a1ec5 -s ours am: b6d4fe1a99 -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/+/24575089 Change-Id: I1e6f8160a6350a9ec3ce8a0c2033dc2258fedb57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions