tree 29b9cbe6f3a2bb4990e24b29cc5d50942f49be39
parent c1fa34b9f600c827769b4401d8b12e7c587b68f4
parent ee923139c346e6751203fc7d2a341388e01c7b19
author Paul Crowley <paulcrowley@google.com> 1436833676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436833676 +0000

am ee923139: Merge "Set up user directory crypto in init." into mnc-dr-dev

* commit 'ee923139c346e6751203fc7d2a341388e01c7b19':
  Set up user directory crypto in init.
  logd: switch to unordered_map from BasicHashtable
  rootdir: make sure the /oem mountpoint is always available