Mark Salyzyn 7c6b5aff8f Merge \\\\"Settings: add logpersist selection (strings)\\\\" am: 99afd4a87d am: 540ebc39ac -s ours am: 1f9e0cce2b ...

am: 7bc9c6d7c4

Change-Id: Icf3b5645961c5902532428d9c98c7eca8b03660e

2016-06-09 20:29:18 +00:00

res

Merge "Removed unused string (high_power_count)."

2016-06-09 17:20:43 +00:00

src/com/android/settings

Merge \"Merge \\"Moved network settings reset away from Backup & reset.\\" into nyc-mr1-dev am: ab595b8a98\" into nyc-mr1-dev-plus-aosp

2016-06-08 21:42:37 +00:00

tests

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: e8df0892d4

2016-05-23 12:09:38 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

resolve merge conflicts of 7f7092c to nyc-mr1-dev

2016-06-08 16:19:35 -04: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

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +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%