summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Guojing Yuan <guojing@google.com> 2024-04-03 20:58:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-03 20:58:02 +0000
commit3bc71d48a29168e7e4e687411f7b165fe39cdcb4 (patch)
tree21c7254af399b8764f2df56d8295dc219ba780a9 /libs/input/SpriteController.cpp
parent7bc4b9391bef5b31923a11bf9f2b817083dc2adb (diff)
parent195f9704e0a2a8ce5f0df31a317edb8ebee15ab0 (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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I559c8c186b406c886e3b7681a77f34afd6fa97d8 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