OSDN Git Service

Manually merge commit 'b406ffa' into stage-aosp-master
authorThe Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:08:35 +0000 (04:08 +0000)
committerThe Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:08:35 +0000 (04:08 +0000)
commit04c55e6ed7259c5fb0c3d951f4995778feff2a34
tree14ceb65e45ab4895db1b1fdfb45bf4dbd96394be
parent4f70554179273c1ec8ec4f502382334f584a4e40
parentb406ffaa86d6c28c9f92308417f4cae36d0c9d4e
Manually merge commit 'b406ffa' into stage-aosp-master

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

BUG:33304034
cryptfs.c