Eric Fischer 32d3e4e383 resolved conflicts for merge of 746902a1 to graphics-dev ...

Change-Id: I4ed1fa0c91e8e27d718bc92e278367d0bd65f0d3

2012-02-01 11:43:10 -08:00

assets/html

Fix to bug 3389385.

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

res

resolved conflicts for merge of 746902a1 to graphics-dev

2012-02-01 11:43:10 -08:00

src/com/android/settings

am 43cbe3ff: am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"

2012-01-27 21:09: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%