OSDN Git Service

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


Trivial merge