Mike Lockwood e7728d9adc Merge commit '3c7aec3' ...

empty -s ours merge

Change-Id: I5f47de50b940f587b4339c13798ec5797f011d02

2012-03-21 16:11:52 -07:00

assets/html

Fix to bug 3389385.

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

res

Import translations. DO NOT MERGE

2012-03-21 13:35:52 -07:00

src/com/android/settings

Merge "Remember when NetworkPolicy was inferred."

2012-03-20 16:54:54 -07: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

Add debug app / wait for debugger dev options.

2012-02-14 13:46:27 -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 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%