tree 6693db61f4ef3414209cd09d65f87149a28e26ad
parent 1951fc3667eb5216500cfcc63c1bc3506759e086
parent 96b87a1dc0b822a057ad978de1d52990d617be62
author Narayan Kamath <narayan@google.com> 1421662532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421662532 +0000

am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"

* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]