diff options
| author | 2023-09-13 18:42:21 +0000 | |
|---|---|---|
| committer | 2023-09-13 18:42:21 +0000 | |
| commit | 1249b648002455b09c31898563247de091a89033 (patch) | |
| tree | 49c2fac07ca23846fbd95e979578a3de231ea757 /libs/androidfw/StringPool.cpp | |
| parent | 320c36ab5dcc7a4350d69c65849845c3ec928d01 (diff) | |
| parent | 83128c9fdc04f3d7cb83353fbcfa1fb33b68679b (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: b8780fe610 -s ours am: 35b55f9b0f -s ours am: 43aaaacbec -s ours am: da341c6907 -s ours am: 83128c9fdc -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: Ic3f34f8e1aa018fbbaa8328bcc156bc13da63a59
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