diff options
| author | 2023-09-13 18:04:39 +0000 | |
|---|---|---|
| committer | 2023-09-13 18:04:39 +0000 | |
| commit | a16296b5c20517cd60ff7319a144504225d2b700 (patch) | |
| tree | 4ee55dca1f71f2d8924dc27e8a258aba3dedd076 /libs/androidfw/FileStream.cpp | |
| parent | e7002ad5e80091ced191ab9f85267025743e075c (diff) | |
| parent | 38ec88a2dc4d1479d857e98a332fa78ed7e6369e (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: 38ec88a2dc -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: I49fb0a212d8873f31dffb14dd5b10640115b6251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions