tree 797c4b3d81575250820a2bf59d97ad2086894eef
parent d577641411f067c93aabcd2acf7ce06862fb26d3
parent ba8abb517d1eddebeda62bf907fa446e3c3b81f6
author jp abgrall <jpa@google.com> 1363030086 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030086 -0700

am ba8abb51: Merge "Ensure dumpstate children die"

* commit 'ba8abb517d1eddebeda62bf907fa446e3c3b81f6':
  Ensure dumpstate children die