OSDN Git Service

Manually merge commit 'bf03f2e' into stage-aosp-master
authorThe Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:08:00 +0000 (04:08 +0000)
committerThe Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:08:00 +0000 (04:08 +0000)
commita083ba6a4860dfd084408986106bb4e32e176588
tree9763285b1a3e7bbac4f48d4c39f83cf078b5a2ad
parent72fc75c1f772dc2073d53dd100e808327faa4789
parentbf03f2ef8ae64ff4f8926081843c3b25d0181291
Manually merge commit 'bf03f2e' into stage-aosp-master

* commit 'bf03f2e':
  ext4_utils: move ext2simg to upstream e2fsprogs
  ext4_utils: use mke2fs instead of make_ext4

BUG:33304034