OSDN Git Service

am 354307bf: am e2d1e633: (-s ours) am dfff022d: Merge "ext4_utils: Wrap wipe.h to...
authorTao Bao <tbao@google.com>
Thu, 27 Aug 2015 14:42:14 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:14 +0000 (14:42 +0000)
* commit '354307bf8ed359b8c893217564d2413d2bb0bfcc':


Trivial merge