Commit 1cae5f81 authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am 7104a313: (-s ours) DO NOT MERGE resolved conflicts for merge of 0ce7d5e3... 

am 7104a313: (-s ours) DO NOT MERGE resolved conflicts for merge of 0ce7d5e3 to jb-mr1-dev-plus-aosp

* commit '7104a313':
  DO NOT MERGE Allow writable files in /sys/fs/selinux
parents 4b34d37d 7104a313
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