tree 329075fdd7b27fc56fea104e0675cbd836b0f7af
parent 3b9cfe30ed4ae34d06a8f005c8ada593c314316b
parent 686947801e7c35eb60bf25385f46e45db66bee69
author Craig Mautner <cmautner@google.com> 1426082344 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426082344 +0000

am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"

* commit '686947801e7c35eb60bf25385f46e45db66bee69':
  [ActivityManager] Fix index OOB when resetting removed task