diff options
| author | 2023-09-13 18:41:42 +0000 | |
|---|---|---|
| committer | 2023-09-13 18:41:42 +0000 | |
| commit | 5ad898222bbe75722e41d31e6130783762660e7d (patch) | |
| tree | 49c2fac07ca23846fbd95e979578a3de231ea757 /libs/androidfw/StringPool.cpp | |
| parent | 471e1f5426ca2a64d0e3b04fb57232d9f9295852 (diff) | |
| parent | 2ddd5db2b76dbf3b3cbe0875f50455a6a0788085 (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: 5a545da654 -s ours am: 2ddd5db2b7 -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: I5dea41bf229b03287a0ef12e323816ad105e70fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions