OSDN Git Service

am fd7db732: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:28:39 +0000 (15:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:28:39 +0000 (15:28 +0000)
* commit 'fd7db732434eb41fda69a353053bcb7aab259529':
  DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl


Trivial merge