commit | 2e19aa92ed83ac55185890743a417a5f2af1cdfe | [log] [tgz] |
---|---|---|
author | Bowgo Tsai <bowgotsai@google.com> | Thu Jul 20 02:01:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 02:01:05 2017 +0000 |
tree | d78d4deaece8d12f920c2de022f65925b0e9d303 | |
parent | 5b1202976eeedbcca5041416dff043d9233d5e1f [diff] | |
parent | e5de94756b6c205e8f5915330d05ad3727be5a30 [diff] |
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675 am: 84937296c6 am: e5de94756b Change-Id: Iedca76aea1c93320bbba29bcd013d1cd331380de