tree 7f4de12979a604213fdeb0e795a4c67f74c23362
parent 8fc710cc6abffc6425e6bdadcbefe88240e76349
parent 1a3b759a952b1cde773cd4acae28592ff0447782
author Tri Vo <trong@google.com> 1561078022 -0700
committer android-build-merger <android-build-merger@google.com> 1561078022 -0700

Merge "vold: use RAII wake locks" am: 798aa303da am: 56c6681ba8 am: c3d9197784
am: 1a3b759a95

Change-Id: Ibb6db27d179e6dc64adc0add7ad163d2a30ec979