summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 13:01:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 13:01:46 +0000
commitfefbfeea88f650847c4983108312c1ea86c6931f (patch)
treef7807ef7238c22d00f33feb354ad3b114c4423f1 /libs/androidfw/AssetManager.cpp
parentc739548463230de1b23d2df996020dbdf5adc8b1 (diff)
parentc2a52889c29e43444648138bf970ee2e1efcc484 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889c2 -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760cad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24573550 Change-Id: I2ebf8ed4213c483bd1ff2c0c964f70c09ae8c39f 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