Robin Lee edfeaace61 resolve merge conflicts of cb1968148a to master ...

Test: make RunSettingsRoboTests
Change-Id: I436af9f0415b9ad7ea0ea53f4f68d337fdbaa0aa

2017-01-19 23:58:30 +00:00

res

resolve merge conflicts of cb1968148a to master

2017-01-19 23:58:30 +00:00

src/com/android/settings

resolve merge conflicts of cb1968148a to master

2017-01-19 23:58:30 +00:00

tests

Merge "Add example of google truth in a non robolectric test"

2017-01-19 23:15:49 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

AndroidManifest.xml

Merge "Update StorageSettings to use StorageDashbordFragment."

2017-01-13 22:06:46 +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%