Bart Sears 8e7c979bad resolve merge conflicts of 7e0586b7a6 to master. ...

Change-Id: I73b3e010249ac7380677cb2e635f4c847a8446c4

2016-01-13 21:39:37 -08:00

res

resolve merge conflicts of 7e0586b7a6 to master.

2016-01-13 21:39:37 -08:00

src/com/android/settings

Merge "Auto-advance when fingerprint touch is detected."

2016-01-13 23:37:12 +00:00

tests

Import translations. DO NOT MERGE

2016-01-05 07:56:37 -08:00

Android.mk

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AndroidManifest.xml

Merge "Use the new TETHER_PRIVILEGED permission."

2016-01-11 19:10: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

Add option to reset network settings to factory

2015-03-09 13:18:50 -07: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%