tree b11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parent ba374a8793d48c3f75873e8168fd48116c33ceab
parent 145fc84a79b1f6cb19240c492694f3e074202c12
author Paul Lawrence <paullawrence@google.com> 1433173413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433173413 +0000

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