tree 0485f9b73081f5a91757bb66a9570bf08ea6dd73
parent 4d0dadb62941aba77e623e13ee4e5445c4a7502b
parent fce081efa67aff176510cb244aa8d79173e80a20
author Ruslan Tkhakokhov <rthakohov@google.com> 1561130877 -0700
committer android-build-merger <android-build-merger@google.com> 1561130877 -0700

Merge "Merged-In Revert "vold: use RAII wake locks"" am: 2ebb5c5b96
am: fce081efa6

Change-Id: If58a55eecb04453f69e51cdc242f5ab71fb7ddc1