tree 14ceb65e45ab4895db1b1fdfb45bf4dbd96394be
parent 4f70554179273c1ec8ec4f502382334f584a4e40
parent b406ffaa86d6c28c9f92308417f4cae36d0c9d4e
author The Android Automerger <android-build-merger@google.com> 1480738115 +0000
committer The Android Automerger <android-build-merger@google.com> 1480738115 +0000

Manually merge commit 'b406ffa' into stage-aosp-master

* commit 'b406ffa':
  Add support for creating ext4 images with mke2fs

BUG:33304034