diff options
| author | 2023-09-13 17:04:59 +0000 | |
|---|---|---|
| committer | 2023-09-13 17:04:59 +0000 | |
| commit | bd516270ebe4273309ecdd374d1cedda1f4c4831 (patch) | |
| tree | 168ba044da989580bfb10592a6a1b364c8fcbbf0 /libs/androidfw/AssetsProvider.cpp | |
| parent | c1c6a02c5912ecf0b1c66519efb69b71d6356b10 (diff) | |
| parent | 43aaaacbecc087a889b5fc966bdd19da418026ab (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 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: I34dcc721cd6575eaf0ab24736d8188afdf9d8c77
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