diff options
| author | 2023-07-28 11:38:32 +0000 | |
|---|---|---|
| committer | 2023-07-28 11:38:32 +0000 | |
| commit | 062c8872dd45a9354e82dcde125dbf03c93fc872 (patch) | |
| tree | 0dae96dda21be51b75c7fd17bf133dad7f2e171e /libs/input/PointerController.cpp | |
| parent | 48d0cf2c55056e2015d8116fd577d44a8b3ae264 (diff) | |
| parent | 60fdd48f2b1976a70840d63bcf03f9e78b3d6438 (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: 5fb26cd6bc -s ours am: 60fdd48f2b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I5a063913e5bba783c84a0c41a5a70190144494b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions