Adrian Roos cbd67e87de resolve merge conflicts of 523ec54 to master ...

Change-Id: I2f31db207be03a01be7786a0c93abdbb6b84fbf6

2016-08-12 18:05:57 -07:00

res

resolve merge conflicts of 523ec54 to master

2016-08-12 18:05:57 -07:00

src/com/android/settings

resolve merge conflicts of 523ec54 to master

2016-08-12 18:05:57 -07:00

tests

Fix a broken TetherServiceTest. am: 8681148918 am: be9c338253

2016-08-12 00:10:29 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

Add WiFi toggle prompts - settings

2016-08-09 01:55:26 +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%