diff options
| author | 2023-09-13 17:03:34 +0000 | |
|---|---|---|
| committer | 2023-09-13 17:03:34 +0000 | |
| commit | 5a545da654c7cb1a46f7a9c4da35948c9a7bc72a (patch) | |
| tree | 9e6f33dbdf5aa5b9c68ed2929f4c733d34bb5aa4 /libs/androidfw/AssetManager.cpp | |
| parent | f8fa7b75fab1bc0bc33cb6dd964c42be3e7eb7b4 (diff) | |
| parent | 4b195fd20a927ba98f5cc6cf9afe4b34c76d615b (diff) | |
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889c2 -s ours am: fefbfeea88 -s ours am: 7bfeb1b9b3 -s ours am: 6f9b58df54 -s ours am: 78f3f837fa -s ours am: 4b195fd20a -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: I623770d176d1022d42551a295327a6ad85738a27
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