Bill Yi 7a20f4a206 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f -s ours ...

am: 8313368b32  -s ours

Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef

2017-10-20 17:15:14 +00:00

res

Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a

2017-10-20 15:33:50 +00:00

src/com/android/settings

Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a

2017-10-20 15:33:50 +00:00

tests

Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

2017-10-12 19:02:55 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

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

AndroidManifest.xml

Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1 am: 39ddac51b6

2017-09-29 19:04:56 +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%