Marco Nelissen adcbf72c80 am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp ...

* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
  Allow alternate string to be used for min_number

2011-06-07 11:15:26 -07:00

assets/html

Fix to bug 3389385.

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

res

am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp

2011-06-07 11:15:26 -07:00

src/com/android/settings

am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp

2011-06-07 11:15:26 -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%