tree 75348a24b45a75b969e281129e307469b41a3c7d
parent 3a92b606b5a4997a152021e0fdb7ce9c48c1d216
parent 5f68b422bd26a2f017bd72b2796967952e07b30d
author Bowgo Tsai <bowgotsai@google.com> 1494384148 +0000
committer android-build-merger <android-build-merger@google.com> 1494384148 +0000

Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev
am: 5f68b422bd

Change-Id: Ib27c377f2e02d30e0af219a2f08f90087ec11e51