summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2022-06-08 09:32:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-08 09:32:27 +0000
commit5a416bea9c7901ec1a5cd3e1a0664217bcc6d67a (patch)
treeecab490daf1f0da8de0836ddcac36af2143be0e4 /libs/input/SpriteController.cpp
parent1f8941c367d7506f64c98a3e19b60a616743d868 (diff)
parent3bf325c72320ec34abe76b22e7d9f47a6f8f47ac (diff)
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968 Change-Id: I0593f7038a72d8862f075ae442eb519a1352bd19 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