Lorenzo Colitti 67c70267d1 resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp ...

Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504

2011-03-04 14:49:40 -08:00

assets/html

Fix to bug 3389385.

2011-01-26 12:27:44 -08:00

res

Put SSID field first.

2011-03-03 20:08:09 -08:00

src/com/android/settings

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp

2011-03-04 14:49:40 -08:00

tests

Refactor Bluetooth settings for readability and performance.

2011-03-01 18:44:36 -08:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:23:20 -07:00

AndroidManifest.xml

Show more graceful screens for "add network" flow

2011-03-02 13:05:14 -08:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

proguard.flags

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%