Fan Zhang 75d38e4b43 resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp ...

am: 4a1d2c793d

Change-Id: If3e3020d44c4b69aeaa36e3d58ad73f12a6b01bd

2016-07-06 20:59:51 +00:00

res

resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp

2016-07-06 20:59:51 +00:00

src/com/android/settings

Merge \\"Remove search in support tab.\\" into nyc-mr1-dev am: bae81b4a6f

2016-07-06 20:26:29 +00:00

tests

Import translations. DO NOT MERGE

2016-07-05 19:05:09 -07:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp

2016-07-06 13:28:19 -07: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

Ensure classes used via XML are kept by proguard

2016-07-06 12:19:10 +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%