Julia Reynolds 47101fc1b0 Merge "Notification settings can contain dashboard settings" into oc-dev ...

am: 38323f50c7

Change-Id: Id08a627ea7baf128667ad861481bc6d9c712929f

2017-04-17 23:24:43 +00:00

..

res

Merge "Remove FrameLayout around toolbar" into oc-dev

2017-04-17 18:37:45 +00:00

src/com/android/settingslib

Merge "Notification settings can contain dashboard settings" into oc-dev

2017-04-17 23:16:37 +00:00

tests

Merge "Synchronously update APs in during forceUpdate." into oc-dev

2017-04-17 16:35:00 +00:00

Android.mk

Create Espresso test for WifiSettings.

2017-03-31 13:03:33 -07:00

AndroidManifest.xml

…

common.mk

Add missing transitive dependencies

2017-02-16 17:34:29 -08:00