Andrew Sapperstein c0d544943f Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316 ...

Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e

2017-06-26 14:28:10 -07:00

..

assets

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

res

Add a flag to enable/disable new device suggestion

2017-06-22 20:03:09 +00:00

src

Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316

2017-06-26 14:28:10 -07:00

Android.mk

Migrate settings robolectric tests to mockito 2

2017-05-24 15:14:31 -07:00