tree 9b5f4b220260c248b0188356689c1b0f362b2fea
parent ae2fb8b71d5dcee8da6444cf6a430c6d4c57ec8a
parent 07a7be75a7442ef6c6e84f12492382a4d8aeb735
author Theodore Ts'o <tytso@mit.edu> 1437274865 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437274865 +0000

am 07a7be75: Add bare-bones encryption support to e2fsck

* commit '07a7be75a7442ef6c6e84f12492382a4d8aeb735':
  Add bare-bones encryption support to e2fsck