tree 3b77dc4311e746e4d1c4f97aca0dc245e09f6434
parent cf8aed1d13127b78ccb49ac68941df9f1a9738a2
parent 411bb18c73c8c2b0bf986efef248c39fceb259f3
author Android Build Merger (Role) <android-build-merger@google.com> 1499294811 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499294811 +0000

Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 6895d5c44d  -s ours"