Dmitry Dementyev f1fb452863 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 ...

am: 3964c51bf2  -s ours

Change-Id: I8f8c6bd49cc10addae1408f1cfb8b2200184a999

2017-03-09 18:16:23 +00:00

res

Import translations. DO NOT MERGE

2016-09-19 09:38:48 -07:00

src/com/android/settings

resolve merge conflicts of 3964c51bf2 to nyc-dev

2017-03-08 17:12:40 -08:00

tests

Import translations. DO NOT MERGE

2016-09-19 09:38:48 -07: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:13:05 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%