summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Wei Sheng Shih <wilsonshih@google.com> 2024-04-17 12:26:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-17 12:26:43 +0000
commitd93381634c39b97776af9958027362d8bd78f629 (patch)
tree06e39d722c686661e432c3041cbc50ef7856d886 /libs/input/SpriteController.cpp
parent743a7977f14e291892ce8dbdbe8c88d4dae5cb55 (diff)
parentafa97d34985d7e4c700007c15ebf1b372dbbceba (diff)
[automerger skipped] Merge "Revert^2 "Correct activity's lifecycle when the process was killed in background."" into 24D1-dev am: afa97d3498 -s ours
am skip reason: Merged-In I80756609fe643877971408934b19ad97aa0ae746 with SHA-1 bec26a0728 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26955219 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26948953 Change-Id: If6eefc6dcd95309bcce090e8aadfa1d8d64149f7 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