Commit 4b95c2eb authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am fc14d52c: resolved conflicts for merge of 99eefc24 to jb-mr1-dev-plus-aosp 

* commit 'fc14d52c':
  Revert "Allow writable files in /sys/fs/selinux"
parents f2fa9837 fc14d52c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment