Maurice Lam 97f35625b7 Merge "Revert choose lock header file to non-setup theme" into oc-dev am: 1ecbb7d16d ...

am: 40c22ec75a

Change-Id: I6d2d29f3166ff88a38c92b1eb3fa00c7c2abe61c

2017-03-29 16:53:56 +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

Revert "Convert BT preference to use TwoTargetPreference" am: 457c3cbec2

2017-03-28 20:21:52 +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