Antony Sargent 6a5f36a494 Merge "Set advanced battery usage items as non-selectable" into oc-dev ...

am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13

2017-06-09 15:49:10 +00:00

..

assets

Add a new Bluetooth device details page

2017-06-05 11:17:06 -07:00

res

Use support feature provider to provide intro url.

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

src

Merge "Set advanced battery usage items as non-selectable" into oc-dev

2017-06-09 15:49:10 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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