diff options
| author | 2023-09-13 13:53:15 +0000 | |
|---|---|---|
| committer | 2023-09-13 13:53:15 +0000 | |
| commit | 7bfeb1b9b388846ae2d223ffa690e80ffa592c40 (patch) | |
| tree | 1985913bd85cb2023a92e3206444c2038b026cb6 /libs/androidfw/AssetManager.cpp | |
| parent | 2f082e1a70eec9f22d6b3bad7ff63e20e0510077 (diff) | |
| parent | fefbfeea88f650847c4983108312c1ea86c6931f (diff) | |
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889c2 -s ours am: fefbfeea88 -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: I10a2564c5c2f431c283e901e3b47f85168ab4c89
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