OSDN Git Service

am f65354a9: Merge "Add bare-bones encryption support to e2fsck"
authorMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jul 2015 19:35:17 +0000 (19:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jul 2015 19:35:17 +0000 (19:35 +0000)
* commit 'f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
  Add bare-bones encryption support to e2fsck


Trivial merge