Rich Cannings 40994b00af [automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2 -s ours am: 44427259e8 ...

am: 4afd567d8d -s ours
am skip reason: subject contains skip directive

Change-Id: I0734c123fb365bccad8bdd124ada568e46e963d3

2019-04-04 00:42:25 -07:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Merge "Add a flashlight handler activity to support indexability."

2019-04-03 20:48:23 +00:00

src/com/android/settings

Merge "Use CDS display white balance getter and setter"

2019-04-04 01:38:46 +00:00

tests

Merge "Use CDS display white balance getter and setter"

2019-04-04 01:38:46 +00:00

Android.mk

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

AndroidManifest.xml

Merge "Add a flashlight handler activity to support indexability."

2019-04-03 20:48:23 +00:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Add fp icon with background shape

2019-03-22 12:06:36 -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

OWNERS

Update owners

2018-12-19 20:24:23 -08:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00: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%