diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-21 16:54:30 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-07-21 16:54:30 -0700 |
| commit | b68ab7a356a5a1fc403fdbb6fec60dcedf075a3d (patch) | |
| tree | ec7d1bb0c0d08df4997bdffbf4b28ba92c285d90 /sepolicy | |
| parent | 8906d4499a782b0b208b314c583fcc683d406449 (diff) | |
| parent | 1ed1f7c14b17b533003c6a57d37a9958528f737b (diff) | |
resolved conflicts for merge of 1ed1f7c1 to mnc-dr-dev-plus-aosp
Change-Id: Ie5b2439c14a604290469f759e40826d8d232d625
Diffstat (limited to 'sepolicy')
| -rw-r--r-- | sepolicy/file_contexts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 4143a49..8b172dc 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -23,4 +23,4 @@ /dev/block/pci/pci0000:00/0000:00:01\.0/by-name/userdata u:object_r:userdata_block_device:s0 /dev/block/pci/pci0000:00/0000:00:01\.0/by-name/recovery u:object_r:recovery_block_device:s0 /dev/block/pci/pci0000:00/0000:00:01\.0/by-name/boot u:object_r:boot_block_device:s0 - +/dev/block/zram0 u:object_r:swap_block_device:s0 |