Jorim Jaggi cb9d7a96bb resolved conflicts for 99bbec73 to master ...

Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb

2015-09-09 18:48:27 -07:00

res

resolved conflicts for 99bbec73 to master

2015-09-09 18:48:27 -07:00

src/com/android/settings

resolved conflicts for 99bbec73 to master

2015-09-09 18:48:27 -07:00

tests

Import translations. DO NOT MERGE

2015-07-29 06:05:53 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-24 14:35:02 -07:00

AndroidManifest.xml

Renamed primaryUserOnly to systemUserOnly

2015-08-25 18:22:53 -07: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%