tree 1a35ed37f6db8ec040956f2c3c2bd7ed5559fb74
parent bb0bb9aebb76a516bae7b32054852eb828a8ece8
parent 3e809794fe558d8a10851c0ac22a65a2c81fa315
author Narayan Kamath <narayan@google.com> 1421680618 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421680618 +0000

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

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