Chris Wren d55cebe713 Merge \"Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b6118f am: 420d46ee68\" into nyc-mr1-dev-plus-aosp ...

am: 51a68b2c2d

Change-Id: I1a2d25ca0aaf32871001f81b266e23da7a6f63b2

2016-06-15 19:12:43 +00:00

res

resolve merge conflicts of c8466a3 to master

2016-06-15 11:26:32 -07:00

src/com/android/settings

Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b6118f am: 0a13cfbf8e

2016-06-15 19:12:43 +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

Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev

2016-06-14 17:00:56 +00: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%