tree 03161f1b5ff1c587136b2958278fa4fe5fa5d879
parent 33c3c190f7b328a55c4d2db917bec10d116d71ba
parent ee042cac7110d304e28a551b5e7b13e98985a85c
author Bowgo Tsai <bowgotsai@google.com> 1508038007 +0000
committer android-build-merger <android-build-merger@google.com> 1508038007 +0000

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

Change-Id: I3579738b8d9a3d4026294ba3392b56a55aedb9a9