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