Steven Ross 6bf64b81c0 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1 ...

* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287

2011-11-05 19:33:54 +00:00

assets/html

Fix to bug 3389385.

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

res

am f53c3602: Bring back Android Dreams.

2011-11-03 11:01:56 +00:00

src/com/android/settings

am 815c7a04: am 01b32368: Add provisioning checks for BT and USB

2011-11-05 19:33:44 +00:00

tests

Import revised translations.

2011-11-02 10:30:43 -07:00

Android.mk

CA certificate settings fragment

2011-06-27 15:16:42 -07:00

AndroidManifest.xml

Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.

2011-10-31 14:56:18 -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

Add PowerUsageSummary to proguard list.

2011-06-29 17:24:14 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%