| commit | 04b01d8c292e155a463f8f1898ff1a2ab7d634cd | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Apr 02 16:20:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 02 16:20:13 2015 +0000 |
| tree | d545fa87b882468deced500049e9c3c13f652490 | |
| parent | 988b16ce4e221c5c824afdedc3fcff0222e843fa [diff] | |
| parent | 0dbb7d33082ac3f12d2422d9af941f34686028e4 [diff] |
am 0dbb7d33: Merge "ext4_utils: Abstracting ext4 encryption property system" * commit '0dbb7d33082ac3f12d2422d9af941f34686028e4': ext4_utils: Abstracting ext4 encryption property system