| commit | 89bcea4efeb7ba081d76c6f3bbec3190281ed2db | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Apr 01 19:05:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 19:05:38 2015 +0000 |
| tree | 79acc3853d57715fd134dd47bc085abc0b5aaf64 | |
| parent | 0e3e0f67b9d326fed57f58765a7e44e57ad781ca [diff] | |
| parent | 4fcb9e2f4017e68066e7c57ec74063f87224ff8d [diff] |
am 2c383211: (-s ours) am ffe5c0d1: am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" * commit '2c383211528305f1db870a226f8734cdfc6bae4c': Revert "Revert "Adding e4crypt support""