tree 5826ba863c2a9cac1af0fa9a91c331ab010a24c2
parent ff01e0da777842db54be765bbf5f95339634cee0
parent 2da820c0ab87812902b1aac7f782a66060d19a76
author Bowgo Tsai <bowgotsai@google.com> 1508040893 +0000
committer android-build-merger <android-build-merger@google.com> 1508040893 +0000

Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b am: 6353d514e8 am: ee042cac71
am: 2da820c0ab

Change-Id: I5f111f4e0b47dfc6a5da35cbbec2b842c6e72150