tree 364bcf130257fc8a15a5764611c502baa312af0d
parent afada2c7dccaeda615fd2d345997753dfbba8022
parent 40489be90b7c145da75034f793932500f0e5d380
author Dianne Hackborn <hackbod@google.com> 1379367450 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379367450 -0700

am 40489be9: am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev

* commit '40489be90b7c145da75034f793932500f0e5d380':
  Implement issue #10691359: Kill long-running processes