commit 8f90ca03701f2a81427920cc6ef012b6045071a0
author Vineeta Srivastava <vsrivastava@google.com> Fri Jul 17 15:48:41 2015 -0700
committer The Android Automerger <android-build@android.com> Sat Jul 18 11:59:35 2015 -0700
tree 3aa39bbd9c329febb6764248b8d2d74d3cadb468
parent 7c74c400dba052c1e24d99f9bc9ae2494259075f

Revert "Enable file encryption on Bullhead"

This reverts commit 130f1297462300c6815818c6063910b3d5a49c75.

fstab.bullhead

diff --git a/fstab.bullhead b/fstab.bullhead
index 05e727d..6a519cb 100644
--- a/fstab.bullhead
+++ b/fstab.bullhead
@@ -5,7 +5,7 @@
 
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/system       /system         ext4    ro,barrier=1                                                    wait,verify=/dev/block/platform/soc.0/f9824900.sdhci/by-name/metadata
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor       /vendor         ext4    ro,barrier=1                                                    wait,verify=/dev/block/platform/soc.0/f9824900.sdhci/by-name/metadata
-/dev/block/platform/soc.0/f9824900.sdhci/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check,fileencryption
+/dev/block/platform/soc.0/f9824900.sdhci/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check,encryptable=/dev/block/platform/soc.0/f9824900.sdhci/by-name/metadata
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/persist      /persist        ext4    nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait,notrim
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/modem        /firmware       vfat    ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0        wait