Robert Greenwalt 89b8babe6a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp ...

Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5

2016-06-13 13:01:36 -07:00

res

Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev

2016-06-13 17:40:12 +00:00

src/com/android/settings

resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp

2016-06-13 13:01:36 -07:00

tests

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev

2016-05-23 11:58:58 +00:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

2016-02-16 17:22:08 -08:00

AndroidManifest.xml

Merge \"Remove PreferenceActivity\" into nyc-dev

2016-06-08 19:15:42 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07: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 Tron Logging to portion of A11y SUW that lives in Settings.

2016-04-01 14:34:17 -07:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%