tree 49827a4e23f11f54f5c54ee0c0b085983a5e251b
parent b78348d5b49ab2899b414d5700f0d7e6e797dfc6
parent b0efa98d97c04f4f97f57aae954aa61cb14683fe
author Daniel Cashman <dcashman@google.com> 1415301721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415301721 +0000

am b0efa98d: Merge "Switch qemud to permissive_or_unconfined()."

* commit 'b0efa98d97c04f4f97f57aae954aa61cb14683fe':
  Switch qemud to permissive_or_unconfined().