Roozbeh Pournader 55e6e16e48 Merge \"Merge \\\"Use existing localizations for formatting data usage [DO NOT MERGE]\\\" into nyc-dev am: 5eddc4bde9 am: 241f8e6e9c\" into nyc-mr1-dev-plus-aosp ...

am: c553faaa00  -s ours

Change-Id: I039044e7feb83b709e8d5f6a75302ed640500d70

2016-06-09 23:15:46 +00:00

res

Merge "added layout_width and layout_height"

2016-06-09 21:35:52 +00:00

src/com/android/settings

Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e5318496e am: 650cc723d1

2016-06-09 23:05:21 +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-13 13:02:38 -07:00

AndroidManifest.xml

resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp

2016-06-08 15:28:48 -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-13 13:02:38 -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%