Evan Charlton 412901a052 am 33da8dde: Merge "Allow for a configurable WiFi restore bounce delay" ...

* commit '33da8dde5f3e37f7097e59ad2d67e3e9f54b7436':
  Allow for a configurable WiFi restore bounce delay

2014-01-29 07:02:20 -08:00

..

res

am 91beb94c: resolved conflicts for merge of a5bb65aa to master

2014-01-22 19:06:07 -08:00

src/com/android/providers/settings

Merge "Allow for a configurable WiFi restore bounce delay"

2014-01-29 14:58:29 +00:00

Android.mk

Some system apps are more system than others

2013-06-17 12:47:35 -07:00

AndroidManifest.xml

Switch settings provider to use the new Settings icon

2013-10-14 15:24:31 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…