| commit | c231e92e7f24777795c3eb8f968c8313c7401052 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Mar 27 23:43:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 23:43:18 2015 +0000 |
| tree | ba446a01a51b4542931c7666f30753bd285a51d0 | |
| parent | 1b32493917695c648b371cd5e005c99074fa0c4f [diff] | |
| parent | 75c6509ba647dd3d6fb61df6e59c52b16b7cda3f [diff] |
am 75c6509b: Merge "[HACK] Adding e4crypt support" * commit '75c6509ba647dd3d6fb61df6e59c52b16b7cda3f': [HACK] Adding e4crypt support