Commit 73dc3518 authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am 79f86a87: resolved conflicts for merge of 76bcfb54 to jb-mr1-dev-plus-aosp 

* commit '79f86a87':
  Allow writable files in /sys/fs/selinux
parents 38495164 79f86a87
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