summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 03:05:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 03:05:41 +0000
commit02980f8d173b99dd92ccd1f0c3a1d5d7b32cdde5 (patch)
tree6c741b3b6fc898d62cd72612b78da6cf7ff53c59 /libs/androidfw/AssetsProvider.cpp
parent07463dbd78625faf2957911b79afc80b0291457b (diff)
parentdb924acea56edd380eefce6ed82058530096c10d (diff)
[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760cad -s ours am: 0574a0ea54 -s ours am: 23598c2fe0 -s ours am: e8f6c57c00 -s ours am: ff538fe4ed -s ours am: 5c2338f336 -s ours am: db924acea5 -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: Ie2de535e9ae76a3dbf0047d1df2b126a5338a8c8 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