The Android Open Source Project 9ae0b5a23d am b2a0ea35: Reconcile with ics-mr1-release ...

* commit 'b2a0ea3541191318a8810cef63a2d2b7d9566e4e':

2012-03-01 10:43:48 -08:00

assets/html

Fix to bug 3389385.

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

res

Import translations. DO NOT MERGE

2012-02-08 19:08:43 -08:00

src/com/android/settings

am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.

2012-02-28 10:13:28 -08:00

tests

Import revised translations. DO NOT MERGE

2011-11-29 13:18:54 -08:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Merge "Dismiss dialogs properly on closing." into ics-mr1

2011-11-15 10:12:32 -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

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%