tree 6029a88a7540e75b4b4cc260cd986d2908e1d1ab
parent 42318b810958311ecd3d956f89143b168ec41f84
parent 7c7895755cf23140f08b7416ceff006dbbf7a411
author Paul Lawrence <paullawrence@google.com> 1432322929 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432322929 +0000

am 7c789575: Merge "Revert "Set up crypto for user directories in init.""

* commit '7c7895755cf23140f08b7416ceff006dbbf7a411':
  Revert "Set up crypto for user directories in init."