OSDN Git Service

am 9dcaf3a9: (-s ours) am db1d49c7: (-s ours) DO NOT MERGE New ext4enc kernel switchi...
authorPaul Lawrence <paullawrence@google.com>
Fri, 29 May 2015 21:13:06 +0000 (21:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 21:13:06 +0000 (21:13 +0000)
* commit '9dcaf3a94384fb26367231e5d5f07e2740813e02':
  DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl


Trivial merge