tree 0485f9b73081f5a91757bb66a9570bf08ea6dd73
parent b8150885e39298bde35838e5afbffa0fee265ba2
parent 0e2317857b82352c18c773108e96140fa7c4f42c
author Ruslan Tkhakokhov <rthakohov@google.com> 1561133453 -0700
committer android-build-merger <android-build-merger@google.com> 1561133453 -0700

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

Change-Id: I1fa6054701877f2e6b81bd22292311234f47bc64