Fan Zhang e8e23081fa Merge "Show setting for work profile lock screen notification" into oc-dev ...

am: 5bb87f9f34

Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d

2017-05-25 23:16:54 +00:00

..

app

Import translations. DO NOT MERGE

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

robotests

Merge "Show setting for work profile lock screen notification" into oc-dev

2017-05-25 22:41:07 +00:00

unit

Added WifiSettings Espresso tests.

2017-05-08 14:48:01 -07:00

Android.mk

Change build targets for settings tests

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