tree 70ca19eeca7d8c87a8e4fe35575ea31c8467378d
parent 996d39743a73cc37fb888779d52323743f50c666
parent 4ac5775d63791ae3635882a3b49f5ebc253262bb
author Narayan Kamath <narayan@google.com> 1421662182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421662182 +0000

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

* commit '4ac5775d63791ae3635882a3b49f5ebc253262bb':
  Fix handling of wrapped processes [part 2]