Maurice Lam ecf1c04f68 am d3107ce4: am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev ...

* commit 'd3107ce40fe4bcabf6d65ad26659b938da610905':
  [Fingerprint] Export FingerprintEnrollIntroduction

2015-07-15 23:12:17 +00:00

res

Import translations. DO NOT MERGE

2015-07-15 07:14:40 -07:00

src/com/android/settings

am d3107ce4: am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev

2015-07-15 23:12:17 +00:00

tests

am 5152086a: am 83a25842: Merge "Lose some deprecated test annotations."

2015-07-14 20:37:05 +00:00

Android.mk

Allow incremental builds for settings.

2015-04-27 21:16:03 +00:00

AndroidManifest.xml

[Fingerprint] Export FingerprintEnrollIntroduction

2015-07-15 11:09:25 -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%