| commit | 181cd0aa7f4df29d92308a890b1aa78964b4549a | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Jul 16 19:49:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 16 19:49:33 2015 +0000 |
| tree | 9b5f4b220260c248b0188356689c1b0f362b2fea | |
| parent | 7a628326847a8ed588c0fa75a2b8ddeb77c782e0 [diff] | |
| parent | ae2fb8b71d5dcee8da6444cf6a430c6d4c57ec8a [diff] |
am ae2fb8b7: am f65354a9: Merge "Add bare-bones encryption support to e2fsck" * commit 'ae2fb8b71d5dcee8da6444cf6a430c6d4c57ec8a': Add bare-bones encryption support to e2fsck