Matthew Fritze be0989cc61 Prevent race conditions after dropping database ...

Manual merge from: ag/2155898

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb

2017-05-05 15:30:39 -07:00

..

app

Import translations. DO NOT MERGE

2017-04-28 19:46:17 -07:00

robotests

Prevent race conditions after dropping database

2017-05-05 15:30:39 -07:00

unit

Merge "Filter on volume for category storage view." into oc-dev am: a41a190ac3

2017-05-02 17:09:37 +00:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00