summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-12 22:53:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 22:53:23 +0000
commit6c73f28cbcb454b7701b3134fc519a271d38b6ad (patch)
tree1985913bd85cb2023a92e3206444c2038b026cb6 /libs/androidfw/AssetManager.cpp
parent0574a0ea54786e690a26381a9faa2f2227fdcee9 (diff)
parent76b6d844527b4e6e51779256a671d1345c2cd0bd (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d84452 -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: I6c22e67cea048566bb54955ea40a21dc1d7220fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions