| commit | 84937296c6301f2102ed883d608638197bf10eca | [log] [tgz] |
|---|---|---|
| author | Bowgo Tsai <bowgotsai@google.com> | Thu Jul 20 01:55:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 01:55:04 2017 +0000 |
| tree | 85e8be89656d9eab171fa5969b52fbebbfda5c18 | |
| parent | 34d4d57b876d7d1702583a2a03b236dde8f201f9 [diff] | |
| parent | a68f6336750531146d05bf45bbf57d0850a89e21 [diff] |
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675 Change-Id: Iba60c7f544ae86a1487354a9e799cab7167f37ad