Fan Zhang 7c60efb930 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am: a42e9351c5 ...

am: 3f070569a6

Change-Id: I7bf58afdb746d70b2a2728875b83d0f0c547d51e

2017-09-16 00:40:43 +00:00

..

assets

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

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

res

Use preference theme from SettingsLib

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

src

Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am: a42e9351c5

2017-09-16 00:40:43 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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