Doris Ling 7044490cfe resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp ...

am: 6dcd71756d

Change-Id: Iae1f9cbd2f8e677e82f27e69de35228a4ae35b99

2016-08-24 16:15:51 +00:00

res

Merge "Refactored Screenshot preference to be dependent on context preference."

2016-08-24 01:37:57 +00:00

src/com/android/settings

resolve merge conflicts of 6890d53 to master

2016-08-24 10:50:28 -04:00

tests

Merge "Extract and refactor logic to determine the data usage summary mark."

2016-08-23 21:24:42 +00:00

Android.mk

Build with AAPT2

2016-08-17 10:19:00 -07:00

AndroidManifest.xml

Merge "remove duplicate permissions"

2016-08-18 23:25:04 +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

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00: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%