tree 0e7d5d922e407ab801edb25b101e81f389b6527e
parent f0768d71bdba1db5bf70fbe9aa587ae7e652df21
parent 7d50596a9c27b6db6468009ad196707e08f88bd6
author Benoit Goby <benoit@android.com> 1394478516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394478516 +0000

am 7d50596a: am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev

* commit '7d50596a9c27b6db6468009ad196707e08f88bd6':
  Add CAP_BLOCK_SUSPEND to system server