aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamad Ayyash <mkayyash@google.com>2015-08-27 14:08:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 14:08:15 +0000
commit0fce19190daf581b4afb9cbfcefd5d20adff4a31 (patch)
tree87c06b1fd5913cc08ddbd3b0fe6da99120598cb4
parent9c529151124e146732e47a9ea17f76d0feaa8b60 (diff)
parent19324304f363a55ccdb962e7b95a4e8bb693968d (diff)
downloade2fsprogs-0fce19190daf581b4afb9cbfcefd5d20adff4a31.tar.gz
am 19324304: am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '19324304f363a55ccdb962e7b95a4e8bb693968d':
0 files changed, 0 insertions, 0 deletions