Christine Franks fbf21f4c85 Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5 ...

am: 8606c652d5

Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e

2017-04-06 17:19:25 +00:00

..

app

Merge "Create Espresso test class for WifiSettings." into oc-dev am: 8b06cbd3a9

2017-04-05 22:16:59 +00:00

robotests

Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5

2017-04-06 17:19:25 +00:00

unit

Merge "Change test type from InstrumentationTest to AndroidJUnitTest"

2017-04-01 04:49:19 +00:00

Android.mk

Change build targets for settings tests

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