Doris Ling 744ff5c607 Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c am: c13415391b ...

am: 913d1667ce

Change-Id: Ib859bec6cd9ca1422856d091fc7a0b9894397b04

2017-09-21 19:31:54 +00:00

..

assets

Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3

2017-09-13 09:47:02 +00:00

res

Revert "Introduce CoolColorTemperaturePreferenceController"

2017-09-21 00:33:40 +00:00

src

Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c am: c13415391b

2017-09-21 19:31:54 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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