Doris Ling c209851d54 Merge "Only register conditions receiver when needed." into oc-dev am: 258e8a8117 ...

am: c5cc3ad8ab

Change-Id: Iee3b638cf04acd6fa6ea01ec5ec24e001e15141a

2017-03-29 20:37:01 +00:00

..

app

Merge "Revert choose lock header file to non-setup theme" into oc-dev am: 1ecbb7d16d

2017-03-29 16:53:56 +00:00

robotests

Merge "Only register conditions receiver when needed." into oc-dev am: 258e8a8117

2017-03-29 20:37:01 +00:00

unit

Add test config to SettingsUnitTests

2017-03-22 12:07:08 -07:00

Android.mk

Change build targets for settings tests

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