tree b437ea21cbf4350410b0f69c4506c76a8c271370
parent 58819cde54c61776bf72e8b3369d240cd2dc5b4d
parent 8120c3d1b2a8b4c6570c36bcdaf7c55392f5fa45
author Paul Lawrence <paullawrence@google.com> 1427492541 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427492541 +0000

am 8120c3d1: Merge "Adding e4crypt support"

* commit '8120c3d1b2a8b4c6570c36bcdaf7c55392f5fa45':
  Adding e4crypt support