| commit | 0fce19190daf581b4afb9cbfcefd5d20adff4a31 | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Aug 27 14:08:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:08:15 2015 +0000 |
| tree | 87c06b1fd5913cc08ddbd3b0fe6da99120598cb4 | |
| parent | 9c529151124e146732e47a9ea17f76d0feaa8b60 [diff] | |
| parent | 19324304f363a55ccdb962e7b95a4e8bb693968d [diff] |
am 19324304: am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck" * commit '19324304f363a55ccdb962e7b95a4e8bb693968d':