Kenny Root 42f178d10b resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp ...

Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58

2011-03-30 09:36:40 -07:00

assets/html

Fix to bug 3389385.

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

res

Import revised translations. DO NOT MERGE

2011-03-29 12:00:36 -07:00

src/com/android/settings

resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

2011-03-30 09:36:40 -07: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

resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

2011-03-30 09:36:40 -07: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%