tree 07c96469148c2880d162d50e2dd4a75f66b67432
parent ed4abe576bdaf8c4e08dd2c192999d43b2bd475c
parent 2b95e0d0aa003fe50158e3dcb1f6a81c745075da
author Jin Qian <jinqian@google.com> 1501011102 +0000
committer android-build-merger <android-build-merger@google.com> 1501011102 +0000

Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6
am: 2b95e0d0aa

Change-Id: Ic0ba2478daddb56382b06e321ff11209b8702576