tree d0fdfe1bf8ca1b60763a29e27d7feafc1874efe9
parent 5b35e2dc276ad473fd7a463b0031b31871fa1769
parent 6906f8977aedf176b6f0338b0988370bb79bddb6
author Tianjie Xu <xunchang@google.com> 1536886313 -0700
committer android-build-merger <android-build-merger@google.com> 1536886313 -0700

Merge "Remove the mkuserimg_mke2fs.sh" am: a88a7d23c0
am: 6906f8977a

Change-Id: I63b321b06dc3ced7650e15a9d44007d47d91f3b7