Amit Mahajan d2477357e8 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp ...

Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc

2016-04-19 16:15:56 -07:00

res

Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev

2016-04-19 18:07:20 +00:00

src/com/android/settings

resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp

2016-04-19 16:15:56 -07:00

tests

Import translations. DO NOT MERGE

2016-03-19 04:17:38 +01:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

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

AndroidManifest.xml

Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev

2016-04-19 18:39:19 +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%