am 836e7860: am 8120c3d1: Merge "Adding e4crypt support"

* commit '836e78608dcb16a490330e051416787df2ee14db':
  Adding e4crypt support
gugelfrei
Paul Lawrence 9 years ago committed by Android Git Automerger
commit 36b7b0c681

Diff Content Not Available