tree f3b71bdd58707a052d630229fe474018fee03054
parent 9641423fe5643cb2d9dd471d9ffb86d9998d6db1
parent 82f542f5a10c2b34b8a8171f26363831404b93b3
author Hung-ying Tyan <tyanh@google.com> 1484022155 +0000
committer android-build-merger <android-build-merger@google.com> 1484022155 +0000

Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753 am: 7da0c3db16 am: 70bcce4deb
am: 82f542f5a1

Change-Id: I427f830f6021a0abde66e9db200a9ce6ba8ddcea