tree 948359b632d749ac96be79a9a1792235d6a673bb
parent d452f52b2c7b3877160529a73dc2508b9c9cb40b
parent 20f83f47677fc8bf73e5b18617ac208ecc918f35
author Connor O'Brien <connoro@google.com> 1485318505 +0000
committer android-build-merger <android-build-merger@google.com> 1485318505 +0000

Merge "Allow passing flash block sizes to libext4_utils" am: de893939ec am: 8018614aab am: fa83cde440
am: 20f83f4767

Change-Id: Ic958e6aa526d7d7c0db8aa351af59ae2d0f9e6ae