diff options
| author | 2023-09-13 00:21:52 +0000 | |
|---|---|---|
| committer | 2023-09-13 00:21:52 +0000 | |
| commit | 90893cff811bd4fdbcdf31269d3796cb99d02e3d (patch) | |
| tree | e643e3835c55fd859b751b0990fcd0256ba1eb56 /libs/androidfw/AssetManager.cpp | |
| parent | e8f6c57c00ddcfc9a8c498d906d2ee362961c911 (diff) | |
| parent | d39052c7be24065fefba00601ff1f9f2f5fa1a7f (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 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: Ica6cc4c91f104c04e957047b0468ecc1e46a1647
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