tree 57b2c47d4aed77cc5a96c421b37f5bad2febeeb6
parent eafe0eb772fe05c5bb6bef4b68088fd88ceaa6fe
parent e82df164e8128ec9df0072c4a4f3d92e79a0f5f4
author Daniel Rosenberg <drosen@google.com> 1408392173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408392173 +0000

am e82df164: Revert "Revert "cryptfs: Added support for f2fs fast encryption""

* commit 'e82df164e8128ec9df0072c4a4f3d92e79a0f5f4':
  Revert "Revert "cryptfs: Added support for f2fs fast encryption""