commit | 8ca896284572216cbb60db1526ecc42bffaa53a7 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Mon Jun 01 15:43:33 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:43:33 2015 +0000 |
tree | b11de96f03aeae97ac4fd188f25a2c08c0fe85bc | |
parent | ba374a8793d48c3f75873e8168fd48116c33ceab [diff] | |
parent | 145fc84a79b1f6cb19240c492694f3e074202c12 [diff] |
am 145fc84a: (-s ours) am fd7db732: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl * commit '145fc84a79b1f6cb19240c492694f3e074202c12': DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl