Doris Ling 01639b7504 Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b ...

Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests

2017-05-12 15:51:11 -07:00

..

app

Import translations. DO NOT MERGE

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

robotests

Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b

2017-05-12 15:51:11 -07:00

unit

Merge "Added WifiSettings Espresso tests." into oc-dev am: 6c0f337d52

2017-05-08 23:45:32 +00:00

Android.mk

Change build targets for settings tests

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