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

* commit 'f589444efd60b90e11a60a548c0dc1b3787bc4e1':