Salvador Martinez bbb5ed60bf Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am: ed66c5fcdf ...

am: 23888a246b

Change-Id: I7f82ff69a26028721b6d510b1350191654c84c05

2017-06-22 18:50:40 +00:00

..

assets

Use SettingsLib's versions of Custom* classes.

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

res

Use support feature provider to provide intro url.

2017-06-08 23:34:35 +00:00

src

Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am: ed66c5fcdf

2017-06-22 18:50:40 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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