diff options
| author | 2023-07-28 03:01:04 +0000 | |
|---|---|---|
| committer | 2023-07-28 03:01:04 +0000 | |
| commit | d47040b736f8963e0936cb88844067c839f37e38 (patch) | |
| tree | 6e59c3af6f9e7d5cd94b9845b5eaf92ca7f9c431 /libs/androidfw/ConfigDescription.cpp | |
| parent | 97aefb2953d1204cd3d6bef0cc7d4ca1462f551a (diff) | |
| parent | 5904480a8ac550ce000f85d6000fde05a6077c15 (diff) | |
[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c3b am: 8451e9a0c7 -s ours am: 5bc9e9288e -s ours am: fa10d780de -s ours am: 08dd2ef76b -s ours am: 7d2065df8a -s ours am: 5904480a8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I3c02936aa6eb0ea58b31af58a74d601442afd8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions