| commit | 836e78608dcb16a490330e051416787df2ee14db | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Mar 27 21:42:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 21:42:21 2015 +0000 |
| tree | b437ea21cbf4350410b0f69c4506c76a8c271370 | |
| parent | 58819cde54c61776bf72e8b3369d240cd2dc5b4d [diff] | |
| parent | 8120c3d1b2a8b4c6570c36bcdaf7c55392f5fa45 [diff] |
am 8120c3d1: Merge "Adding e4crypt support" * commit '8120c3d1b2a8b4c6570c36bcdaf7c55392f5fa45': Adding e4crypt support