| commit | ffe5c0d12d15444f6440687a35972f1852436558 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Apr 01 17:50:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 17:50:35 2015 +0000 |
| tree | 6e9c0655624e8f6bedf2dacb3002921cedaad780 | |
| parent | ed92659690dc080235d0e911d0866049bcca6052 [diff] | |
| parent | 27cda9a535c80470e913156e412cbf7e60c3217c [diff] |
am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" * commit '27cda9a535c80470e913156e412cbf7e60c3217c': Revert "Revert "Adding e4crypt support""