tree 3b77dc4311e746e4d1c4f97aca0dc245e09f6434
parent d52ad6a8f8d47cb4450a8f2f333dd6e4c6b5e616
parent 23b2e1bc150ee0741ec08e14b37a57104522217d
author Android Build Merger (Role) <android-build-merger@google.com> 1499294711 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499294711 +0000

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