Bill Yi 967ad51df4 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev ...

am: 59a800d0ec  -s ours

Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4

2017-11-20 22:53:31 +00:00

res

Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26

2017-11-15 21:56:18 +00:00

src/com/android/settings

Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b

2017-11-16 01:36:10 +00:00

tests

Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b

2017-11-16 01:36:10 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Merge "Preference SimSettingsActivity not aligned correctly"

2017-11-16 20:18: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

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +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%