OSDN Git Service

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


Trivial merge