am 88b0df1e: am f589444e: (-s ours) am 5841da45: Merge "Wrap tune2fs.h to be C++ compatible."

* commit '88b0df1efca70e9906a8f49c1074ccf319e11ff1':