tree 79acc3853d57715fd134dd47bc085abc0b5aaf64
parent 94cd52391c2332030046ea9531c9a826ba6f68e6
parent 2c383211528305f1db870a226f8734cdfc6bae4c
author Paul Lawrence <paullawrence@google.com> 1427915138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427915138 +0000

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

* commit '2c383211528305f1db870a226f8734cdfc6bae4c':
  Revert "Revert "Adding e4crypt support""