| commit | c99d70273769baa732cb84a7a605aaacdacb63aa | [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 | d287a59f8248a3eb4afdbc2917ccb3a6c8776b62 [diff] | |
| parent | d6cd23fe7a021be736cdc2683093ca22c637c510 [diff] |
am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" * commit '27cda9a535c80470e913156e412cbf7e60c3217c': Revert "Revert "Adding e4crypt support""