diff options
| author | 2023-09-13 19:47:59 +0000 | |
|---|---|---|
| committer | 2023-09-13 19:47:59 +0000 | |
| commit | 792e89d01827471cab560e0dc90295e8c2eae58e (patch) | |
| tree | 4ee55dca1f71f2d8924dc27e8a258aba3dedd076 /libs/androidfw/StringPool.cpp | |
| parent | 7eea0fe37e14ac7d9de3819faf1af0d82972a85a (diff) | |
| parent | b028b8f2165b12528169ac6c7d73d10ae0a9a558 (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: 4527d3c5a3 -s ours am: 2bffda45b5 -s ours am: b028b8f216 -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: I451834d57bfa0f7105a34dedaf88a264d198f6de
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