diff options
| author | 2023-09-13 02:17:05 +0000 | |
|---|---|---|
| committer | 2023-09-13 02:17:05 +0000 | |
| commit | dfdcf69b26ba4c5dbd61075cf396a1fd1640c7c6 (patch) | |
| tree | 6c741b3b6fc898d62cd72612b78da6cf7ff53c59 /libs/androidfw/AssetsProvider.cpp | |
| parent | f5bc78267b4836e238cf24e0708c57462bd56797 (diff) | |
| parent | 977ef141620cee528ffe8fdf78d72d967769dcb0 (diff) | |
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-dev am: 6ddb560afb -s ours am: 3ac285db15 -s ours am: bcabda4084 -s ours am: e1f73d5360 -s ours am: 4d73b20b89 -s ours am: 03df7a96e4 -s ours am: 977ef14162 -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74cf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24573549
Change-Id: I78b816a06ae96002b895cfc4643499e5deb83725
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