Eric Fischer 58003afdf3 am 6fa18274: am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp ...

* commit '6fa18274e5435ba29e9bb3df812fbe980620895c':

2012-02-02 14:33:15 -08:00

assets/html

Fix to bug 3389385.

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

res

Import translations. DO NOT MERGE

2012-02-02 12:52:44 -08:00

src/com/android/settings

Add Developer Option setting for Animator scaling.

2012-02-02 07:37:15 -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%