The Android Automerger 75c89609b4 merge in ics-release history after reset to master

2012-01-12 14:14:03 -08:00

assets/html

Fix to bug 3389385.

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

res

am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

2012-01-10 10:32:40 -08:00

src/com/android/settings

am d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."

2012-01-12 11:05:22 -08:00

tests

Import revised translations.

2011-11-29 11:19:18 -08:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Have the add dialog maintain state across screen rotation

2011-12-21 17:51:02 +09: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 the cancel button handler

2011-12-07 12:05:58 +09:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%