tree f7950966fe972aedfbe9746274ff2904f4128ccf
parent c756209b898c3951a5d76f84f43d71964b26e498
parent c14e93495b03fd092b25de57f6a5211450390a18
author Jeff Sharkey <jsharkey@android.com> 1536700097 -0700
committer android-build-merger <android-build-merger@google.com> 1536700097 -0700

Merge "vold should be fully developed in AOSP." am: de85ef5c37 am: d7b918f9f3
am: c14e93495b

Change-Id: I63f60fe2ba9c8a8652ee663baa1b214202fee39f