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