summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 01:17:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 01:17:35 +0000
commitadd8193a044e59b8db35866878b5ea491f0d5839 (patch)
tree4b7b72d239c44c2543cf4a824a40863ee0952ff6 /libs/androidfw/AssetManager.cpp
parentff538fe4ed56140f412d7db930780afc48ee2ef2 (diff)
parent90893cff811bd4fdbcdf31269d3796cb99d02e3d (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: 90893cff81 -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: I91f0364ce79602b86cff4ee634c24e2428e1085f 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