tree 38c38831f3a8bff345a92e1e8e85bfa57db480b7
parent 3a3019199c64e5bea2e01e8ce8283a2ee36a624c
parent 6fc893ebca4e2a80ba2c713021a970a8004c9646
author Jin Qian <jinqian@google.com> 1500677233 +0000
committer android-build-merger <android-build-merger@google.com> 1500677233 +0000

Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497b
am: 6fc893ebca

Change-Id: Id765b0a58fad55f940cc6899d3a8c1d4fbf3995c