tree 7d51bc8351e0f3a9c4ca9d770cd685e0f2d1ba5f
parent aa4aa48be51a122a1f6191e8b3a9446765b51d5e
parent 3cc1866454fde5aa68ba2317963de31fd8e5ac13
author Annie Meng <anniemeng@google.com> 1547723360 -0800
committer android-build-merger <android-build-merger@google.com> 1547723360 -0800

Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback."
am: 3cc1866454

Change-Id: I1fe5887b2d4a0c222e95e594562f368587e069c5