Maurice Lam 9a946b3cac am 63c8217b: am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev ...

* commit '63c8217bc95e5f29f0be5a964b45086c84372e35':
  [Fingerprint] Show skip button during SUW

2015-07-24 17:21:19 +00:00

res

resolved conflicts for merge of 769ba03b to master

2015-07-23 21:43:07 -07:00

src/com/android/settings

am 63c8217b: am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

2015-07-24 17:21:19 +00:00

tests

Import translations. DO NOT MERGE

2015-07-20 15:26:26 -07:00

Android.mk

Allow incremental builds for settings.

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

AndroidManifest.xml

Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...

2015-07-21 17:44:49 +01: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%