OSDN Git Service

am 07a7be75: Add bare-bones encryption support to e2fsck
authorTheodore Ts'o <tytso@mit.edu>
Sun, 19 Jul 2015 03:01:05 +0000 (03:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 19 Jul 2015 03:01:05 +0000 (03:01 +0000)
* commit '07a7be75a7442ef6c6e84f12492382a4d8aeb735':
  Add bare-bones encryption support to e2fsck


Trivial merge