diff options
| author | 2023-08-08 06:48:36 +0000 | |
|---|---|---|
| committer | 2023-08-08 06:48:36 +0000 | |
| commit | ed1e4ad93832c320039b85652aceab6ee02dd62c (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/input/PointerController.cpp | |
| parent | 7777bf32a6dbcd81f9cdfc797d5252ccb23b20d5 (diff) | |
| parent | 5d3e350b82b4b60871ba52a6fa4b94cad6024147 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 693a6c22cc -s ours am: 7718d7a585 -s ours am: 73d0008bdb -s ours am: 5d3e350b82 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: Idbf1f35e38c3d5b02ec3fabc89b23c5254802f6e
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