diff options
| author | 2023-09-13 18:05:35 +0000 | |
|---|---|---|
| committer | 2023-09-13 18:05:35 +0000 | |
| commit | 6f37abf35646cb9a65ea38fc4ba4086a057fda90 (patch) | |
| tree | 4ee55dca1f71f2d8924dc27e8a258aba3dedd076 /libs/androidfw/AssetsProvider.cpp | |
| parent | 5014406224ca4af8172df042c150dac1b952db2d (diff) | |
| parent | bd516270ebe4273309ecdd374d1cedda1f4c4831 (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: bd516270eb -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: Ic2cf3af64f4491f20dfc66fd8c4fbb4812a24d3a
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