summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 18:05:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 18:05:16 +0000
commit5014406224ca4af8172df042c150dac1b952db2d (patch)
tree4ee55dca1f71f2d8924dc27e8a258aba3dedd076 /libs/androidfw/AssetsProvider.cpp
parenta16296b5c20517cd60ff7319a144504225d2b700 (diff)
parentc1c6a02c5912ecf0b1c66519efb69b71d6356b10 (diff)
[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0a3 -s ours am: c739548463 -s ours am: 2f082e1a70 -s ours am: 17f9c96594 -s ours am: 8f2c5b8435 -s ours am: 935b1e01d7 -s ours am: 80b7845306 -s ours am: c1c6a02c59 -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: Ic9442b5dc755d813338882d1687ec4277806ceab 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