Tobias Thierer 5ce67493c3 resolve merge conflicts of 999f6a9a29 to master ...

Test: make

Change-Id: If37a66bc38d0fd02ef7465e9be86032c2aff6314

2017-04-26 12:21:23 +01:00

res

Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad

2017-04-26 10:55:55 +00:00

src/com/android/settings

resolve merge conflicts of 999f6a9a29 to master

2017-04-26 12:21:23 +01:00

tests

Merge "Distribute the misc among all the apps" into oc-dev am: e494a3e59b

2017-04-26 10:56:15 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

AndroidManifest.xml

resolve merge conflicts of 999f6a9a29 to master

2017-04-26 12:21:23 +01: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%