Fan Zhang 1f92faad27 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am: 90f9398f4e ...

am: ed71e21541

Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16

2017-09-08 22:23:19 +00:00

..

assets

Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f

2017-09-08 22:22:32 +00:00

res

Use preference theme from SettingsLib

2017-07-10 14:56:49 -07:00

src

Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am: 90f9398f4e

2017-09-08 22:23:19 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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