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