summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-07-07 15:41:55 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-07-07 15:41:55 +0000
commit0a9927025041a6dde3f3878bdd868a69ab1b3266 (patch)
tree3496883eff825dee13b75d35191fbec6494d934b /libs/input/SpriteController.cpp
parent53cc7d7998a9a656fe89ec8eba40ad479bded274 (diff)
parent09c1af5d5c43f716fb4093eae6cf5442e7bb88d1 (diff)
am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1': [ActivityManager] Prevent kill a restarted process again.
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions