tree ba77d439af2cbced0d01e97339f96c44d3fd4605
parent 1fc2d57bbda811548edd0d05802036ee10c82aa7
parent 56c6681ba8222c81f5487091186942a2ee185a57
author Tri Vo <trong@google.com> 1561071473 -0700
committer android-build-merger <android-build-merger@google.com> 1561071473 -0700

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

Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631