tree f90430d63502c86da17b0a3f133ca9919e68d396
parent 82733bd99022a401258fe83cfc8a3edb31a2e10d
parent 7f623decf31028b5a745a1dc8902ee78d0adb44c
author Paul Crowley <paulcrowley@google.com> 1432244799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432244799 +0000

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

* commit '7f623decf31028b5a745a1dc8902ee78d0adb44c':
  Set up crypto for user directories in init.