Kenny Root 9ceeeb6c02 resolve merge conflicts of bdc6074276 to master. ...

Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359

2016-01-21 19:30:35 -08:00

res

Merge "Add padlocks to preferences that can be disabled by policy."

2016-01-21 19:07:02 +00:00

src/com/android/settings

resolve merge conflicts of bdc6074276 to master.

2016-01-21 19:30:35 -08:00

tests

Add unit tests to Utils

2016-01-20 18:45:36 +00:00

Android.mk

resolve merge conflicts of bdc6074276 to master.

2016-01-21 19:30:35 -08:00

AndroidManifest.xml

Implement multiple locales and sublocales in Settings

2016-01-20 12:31:11 -08: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%