summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Guojing Yuan <guojing@google.com> 2024-04-03 21:11:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-03 21:11:21 +0000
commitb080c2404bf83fec93c9be3ae0c2cbc784561a39 (patch)
tree43f8ecf61ecefb1826f7d330ccca981febb562b9 /libs/input/SpriteController.cpp
parent58057540a8408bc92081a645ef6739871d982621 (diff)
parent3bc71d48a29168e7e4e687411f7b165fe39cdcb4 (diff)
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb72 am: 14359bbd1f -s ours am: ca1ed38f14 -s ours am: d8ee4d8b71 -s ours am: 5da632b1af -s ours am: 1694173e5b -s ours am: 9630ba9770 -s ours am: 195f9704e0 -s ours am: 3bc71d48a2 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I3665ef9775c30853076a320bc594a65274560cef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions