tree c2adc5dfe1cbfcae1ff24700168fc3ce89477f18
parent 30c20513a2b9826bcbf36d08a38837b1ec19da99
parent 74c01201dec12b5de43ba0f20a2f38e835cd00af
author Daniel Rosenberg <drosen@google.com> 1408103313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408103313 +0000

am 74c01201: cryptfs: Added support for f2fs fast encryption

* commit '74c01201dec12b5de43ba0f20a2f38e835cd00af':
  cryptfs: Added support for f2fs fast encryption