tree a6f727fd1a496ee8c2c54251dd1e3bf352b5e6ac
parent 0b254f317b6b62cd8d7319acb12ba7d746c01935
parent d7b918f9f35d77609c880d361966d937ea99f3f8
author Jeff Sharkey <jsharkey@android.com> 1536699852 -0700
committer android-build-merger <android-build-merger@google.com> 1536699852 -0700

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

Change-Id: I67eba7b8c6cf076314f5848e4623419931c5131a