Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381

am: ab27993c18

Change-Id: I7f5e6a917e9bfcbd248ab56477be31561f44eb8e
This commit is contained in:
Prashant Malani 2017-01-12 18:09:43 +00:00 committed by android-build-merger
commit 6635787941

Diff Content Not Available