OSDN Git Service

am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck"
authorMohamad Ayyash <mkayyash@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 'd7da78a6e99e85783d5965cd947e9cc7338e9e37':


Trivial merge