diff options
| author | 2023-07-28 07:32:13 +0000 | |
|---|---|---|
| committer | 2023-07-28 07:32:13 +0000 | |
| commit | 5fb26cd6bcd92a2d211f0a2149f9d8c6f96490da (patch) | |
| tree | a14c060eddd4f10a0561efd5ab7f28793ab09120 /tools/aapt/StringPool.cpp | |
| parent | 52ba5774d1d17f5b3ea8449d18318a612b469f19 (diff) | |
| parent | d47040b736f8963e0936cb88844067c839f37e38 (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: d47040b736 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I8e009fcf633f10faf4ef5246c83dfd5023b249b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions