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

* commit '836e78608dcb16a490330e051416787df2ee14db':
  Adding e4crypt support
This commit is contained in:
Paul Lawrence 2015-03-27 23:31:44 +00:00 committed by Android Git Automerger
commit 36b7b0c681

Diff content is not available