tree f193d0c828bc645cf6061d97505e30d9f275a4e2
parent 806047caca937d8e3d067b5fb6d5264fd3731904
parent 69ee6b0a774346af5e621907a0508c02468b4186
author Nick Kralevich <nnk@google.com> 1398364190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398364190 +0000

am 69ee6b0a: am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"

* commit '69ee6b0a774346af5e621907a0508c02468b4186':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server