diff options
| author | 2023-08-08 06:47:46 +0000 | |
|---|---|---|
| committer | 2023-08-08 06:47:46 +0000 | |
| commit | 44085b5d300eb0d6df8733abb067db39dbc29feb (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/input/PointerController.cpp | |
| parent | 989cef9f3fded79476f5724f391b78ae97dcc261 (diff) | |
| parent | 39a5a4fc3f6602056c8587c6d7651fca1399d1b5 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours am: e8b3781508 -s ours am: 0ee52eca70 -s ours am: 6beebebf10 -s ours am: a4a3f61406 -s ours am: fbc04b163d -s ours am: 59f4de32a6 -s ours am: 39a5a4fc3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239
Change-Id: I87aa0d96b8de8bb497492f4ad46bd6b4334576c6
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