| commit | 19324304f363a55ccdb962e7b95a4e8bb693968d | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Aug 27 05:06:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:06:34 2015 +0000 |
| tree | 9b5f4b220260c248b0188356689c1b0f362b2fea | |
| parent | 88b0df1efca70e9906a8f49c1074ccf319e11ff1 [diff] | |
| parent | d7da78a6e99e85783d5965cd947e9cc7338e9e37 [diff] |
am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck" * commit 'd7da78a6e99e85783d5965cd947e9cc7338e9e37':