diff options
| author | 2023-09-13 17:02:00 +0000 | |
|---|---|---|
| committer | 2023-09-13 17:02:00 +0000 | |
| commit | 43aaaacbecc087a889b5fc966bdd19da418026ab (patch) | |
| tree | 18fa0b436003ce0d39c526e230ce241b534d5f80 /libs/androidfw/AssetManager.cpp | |
| parent | 80b78453060ac5b3b53a7eb79cd7982b71f6d4d7 (diff) | |
| parent | 35b55f9b0f09147e6e1d242d86366ec044134512 (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 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: I03c3a2c882a843907d333283af5760afd8fe7805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions