tree 0bb2c108139f0b0e5f41aa0e790c519e180d7735
parent 9e96d851d6e56fb0478bb1fe175d262f039f1d90
parent 2c90b91203476d4ceac4e40df689848841bbeeaf
author Paul Crowley <paulcrowley@google.com> 1517582494 +0000
committer android-build-merger <android-build-merger@google.com> 1517582494 +0000

Merge "Use vold's mount with metadata encryption service." am: 4819edf4fc am: fcc1db2189
am: 2c90b91203

Change-Id: I545e40be18e2e2aca925dd3423e9b0dd5136f658