OSDN Git Service

am 88b0df1e: am f589444e: (-s ours) am 5841da45: Merge "Wrap tune2fs.h to be C++...
authorTao Bao <tbao@google.com>
Thu, 27 Aug 2015 14:08:14 +0000 (14:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:08:14 +0000 (14:08 +0000)
* commit '88b0df1efca70e9906a8f49c1074ccf319e11ff1':


Trivial merge