Freeman Ng 3a5764a4bf resolved conflicts for merge of ab48c22e to master ...

Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0

2011-06-08 13:33:42 -07:00

assets/html

Fix to bug 3389385.

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

res

resolved conflicts for merge of ab48c22e to master

2011-06-08 13:33:42 -07:00

src/com/android/settings

resolved conflicts for merge of ab48c22e to master

2011-06-08 13:33:42 -07:00

tests

Import revised translations.

2011-05-26 15:47:05 -07:00

Android.mk

Fix proguard flag file dependency.

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

AndroidManifest.xml

am 51a1bb15: am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2

2011-06-03 15:55:28 -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%