tree 82250a7e7f7f9b54c2a7d39cd7a55290179ed5c8
parent 634cfcb3f7003368179592ae2832647921bafbef
parent 4814dc5fa78fb8fc1899bb1bcf91b502f922670e
author Jin Qian <jinqian@google.com> 1490480465 +0000
committer android-build-merger <android-build-merger@google.com> 1490480465 +0000

Merge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0 am: d57a607ac7
am: 4814dc5fa7

Change-Id: I8459f1a3dbdc2bbb84a86f4376d3e2c59239862a