tree e896b2ee140c8a63752be8d6c611d5c70b5d00ef
parent 96b87a1dc0b822a057ad978de1d52990d617be62
parent e315feeaff544b1d4dd173f0e341398906f4c0c9
author Narayan Kamath <narayan@google.com> 1421679902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421679902 +0000

am e315feea: Merge "Fix handling of wrapped processes [part 1]."

* commit 'e315feeaff544b1d4dd173f0e341398906f4c0c9':
  Fix handling of wrapped processes [part 1].