commit | 3f10ecabf805fb49300001fad83310e349136ae3 | [log] [tgz] |
---|---|---|
author | Bowgo Tsai <bowgotsai@google.com> | Thu Jul 06 01:12:59 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 01:12:59 2017 +0000 |
tree | 519682fb2b014e94fc2b2ca9ee5eb109dd9e1db6 | |
parent | e26f294187a2757ae2acd65fea68f0d519d071d0 [diff] | |
parent | 06c6bf67e9fa1b5db93216059a9045d681107622 [diff] |
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e am: 06c6bf67e9 Change-Id: Id1f3d275fdeadca1b23a086725b3f63aedc5a141