tree 4b4344df200ef693943d91ca5d1573158a535642
parent d0285ce4e44ff3f4a1c93423515623267a6ee5c8
parent 217b81d8b2493547614e9886f6c09f919695c197
author Ying Wang <wangying@android.com> 1424713661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424713661 +0000

am 217b81d8: am 723d0039: am aa67c0ce: Merge "qemud:  remove permissive_or_unconfined()"

* commit '217b81d8b2493547614e9886f6c09f919695c197':
  qemud:  remove permissive_or_unconfined()