Robin Lee b26ce1e13b resolve merge conflicts of 90f009ebb5 to master ...

Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46

2017-03-27 17:35:57 +01:00

res

Merge "Add strings that will be needed for screen saver settings"

2017-03-25 20:35:08 +00:00

src/com/android/settings

resolve merge conflicts of 90f009ebb5 to master

2017-03-27 17:35:57 +01:00

tests

Merge "Update Sound settings."

2017-03-25 18:30:36 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Merge "Change dialog theme for dialog activity."

2017-03-24 20:01:23 +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

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -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%