| commit | 793e58b936a00ff94923d0a2744b47f54c966b82 | [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 | 5c6fe082e15b3d8cca94b030225564d5f61289f1 [diff] | |
| parent | 6768f17db847cd7686066645e337250c2285c725 [diff] |
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675 am: 84937296c6 Change-Id: Ia71076213c9a6770ff35b999024b1d223c82bd77