Fan Zhang 057f4ae6cc Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev ...

am: b2728f51fb

Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea

2016-06-17 20:20:54 +00:00

res

resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp

2016-06-16 18:58:04 -07:00

src/com/android/settings

Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev

2016-06-17 20:20:54 +00:00

tests

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

2016-05-23 12:03:44 +00:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev

2016-06-16 22:10:10 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Create feature factory interface & initial impl.

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

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%