Fan Zhang 661248cf3e resolve merge conflicts of 0ee60c0 to master ...

Change-Id: Id371c6f3687dc35f87c4a93f032bfc5ca87d15ab

2016-09-14 14:14:14 -07:00

res

resolve merge conflicts of 0ee60c0 to master

2016-09-14 14:14:14 -07:00

src/com/android/settings

resolve merge conflicts of 0ee60c0 to master

2016-09-14 14:14:14 -07:00

tests

Merge "Revert "Linked google truth to Robolectric tests and added an example.""

2016-09-14 00:41:55 +00:00

Android.mk

Build with AAPT2

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

AndroidManifest.xml

Disable NightDisplaySettingsActivity when not available am: e1a16c4f3e am: b606c9ca78

2016-09-13 04:56:14 +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%