Doris Ling 89b315568a resolve merge conflicts of 161093b to master ...

Change-Id: I14c74be54ca216b1f1e369685516a821a94ab30a

2016-07-13 11:18:28 -07:00

res

Merge \\"Center find-sensor graphic in landscape\\" into nyc-mr1-dev am: 22f5b479b5

2016-07-13 00:07:55 +00:00

src/com/android/settings

resolve merge conflicts of 161093b to master

2016-07-13 11:18:28 -07: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-19 23:01:49 +00:00

AndroidManifest.xml

Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev

2016-07-11 22:28:52 +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

Add Night display settings

2016-07-08 11:48:02 -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%