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

* commit 'b7f1f61fbc1c2eae7a689df476da401847a936d9':
  Set up user directory crypto in init.
  logd: switch to unordered_map from BasicHashtable
  rootdir: make sure the /oem mountpoint is always available
This commit is contained in:
Paul Crowley 2015-07-14 12:01:06 +00:00 committed by Android Git Automerger
commit 160816af88

Diff content is not available