am 2c383211: (-s ours) am ffe5c0d1: am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support"""

* commit '2c383211528305f1db870a226f8734cdfc6bae4c':
  Revert "Revert "Adding e4crypt support""
This commit is contained in:
Paul Lawrence 2015-04-01 19:05:38 +00:00 committed by Android Git Automerger
commit 1179b674cb

Diff content is not available