Jason Monk e74ae23269 resolve merge conflicts of 65b5952 to master ...

Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6

2016-04-08 13:34:47 -04:00

res

resolve merge conflicts of 65b5952 to master

2016-04-08 13:34:47 -04:00

src/com/android/settings

resolve merge conflicts of 65b5952 to master

2016-04-08 13:34:47 -04:00

tests

Import translations. DO NOT MERGE

2016-03-18 20:52:22 -07:00

Android.mk

Merge "Add suggestion carousel view and dependencies to settings"

2016-04-01 17:35:47 +00:00

AndroidManifest.xml

TrustedCredentialsSettings should be launched in personal user instead of work user

2016-04-08 15:57:44 +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 Tron Logging to portion of A11y SUW that lives in Settings.

2016-04-01 14:34:17 -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%