tree 4a4ee38890a4de26fd92528634dff8643b60d492
parent ae25aed3c9322b7b9a054f1d1308174a6f8db2e2
parent 5d47a481fb88ca4dba853d064eb5dfd671f9b68a
author Ying Wang <wangying@android.com> 1424712875 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424712875 +0000

am 5d47a481: Merge "goldfish_setup:  remove permissive_or_unconfined()"

* commit '5d47a481fb88ca4dba853d064eb5dfd671f9b68a':
  goldfish_setup:  remove permissive_or_unconfined()