tree 3b77dc4311e746e4d1c4f97aca0dc245e09f6434
parent 23b2e1bc150ee0741ec08e14b37a57104522217d
parent 114b555807b68ff005638f18100e49783e89801f
author Jin Qian <jinqian@google.com> 1499294728 +0000
committer android-build-merger <android-build-merger@google.com> 1499294728 +0000

Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp
am: 114b555807  -s ours

Change-Id: I013b898521c2563d2cf9ed85ce51324c25c0004b