diff options
| author | 2023-09-13 03:05:58 +0000 | |
|---|---|---|
| committer | 2023-09-13 03:05:58 +0000 | |
| commit | cd80f3c5ae1c66383e20654d62963277ffa961f5 (patch) | |
| tree | 6c741b3b6fc898d62cd72612b78da6cf7ff53c59 /libs/androidfw/AssetsProvider.cpp | |
| parent | 02980f8d173b99dd92ccd1f0c3a1d5d7b32cdde5 (diff) | |
| parent | 961a2f57f607b38f406ed59ca8f0269c12226594 (diff) | |
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d84452 -s ours am: 6c73f28cbc -s ours am: d39052c7be -s ours am: 90893cff81 -s ours am: add8193a04 -s ours am: 04cc4301f2 -s ours am: 961a2f57f6 -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/+/24575089
Change-Id: I0290ece0094def2fc2884a1b259f389079891f30
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