summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.cpp
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-07-07 15:06:41 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-07-07 15:06:41 +0000
commit53cc7d7998a9a656fe89ec8eba40ad479bded274 (patch)
treeaa9e5bdc44c200ab2adcabc75293cbb082bb62be /libs/input/SpriteController.cpp
parent10eb3b0665dd7c636af5f0d657512c1a2e309e0c (diff)
parent7611a5d32889f54b1763cf076a442a0575c69b51 (diff)
am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
* commit '7611a5d32889f54b1763cf076a442a0575c69b51': [ActivityManager] Ensure alive process is not killedByAm.
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions