Amith Yamasani 2c6d0d1512 resolved conflicts for merge of 6c82fe07 to master ...

Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6

2011-06-03 14:34:30 -07:00

assets/html

Fix to bug 3389385.

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

res

resolved conflicts for merge of 6c82fe07 to master

2011-06-03 14:34:30 -07:00

src/com/android/settings

Merge "Bulletproof CredentialStorage state handling"

2011-06-02 21:06:56 -07:00

tests

Import revised translations.

2011-05-26 15:47:05 -07:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:23:20 -07:00

AndroidManifest.xml

Merge "Integrating keystore with keyguard (Part 4 of 4)"

2011-06-01 14:33:40 -07: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

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%