Merge "Prevent race conditions after dropping database" into oc-dev am: fc8e64eccb
am: 43171ef58a
-s ours
Change-Id: I9b250e7420e2bf143a69c9a54f340bed040cc32b
This commit is contained in:
fc8e64eccb
am: 43171ef58a
-s ours
Change-Id: I9b250e7420e2bf143a69c9a54f340bed040cc32b