Bill Yi b7d0d2cf2d [automerger skipped] Import translations. DO NOT MERGE ...

am: 222dca5b7c  -s ours

Change-Id: I36cfe2ffff510c8e4d3d96bf4f463d21ef00b24a

2018-11-06 07:07:33 -08:00

res

Import translations. DO NOT MERGE

2018-10-17 04:32:19 +00:00

src/com/android/settings

Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"

2018-10-29 20:35:24 +00:00

tests

Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"

2018-10-29 20:35:24 +00:00

Android.mk

Remove explicit dependency on bouncycastle

2018-10-11 17:02:36 +01:00

AndroidManifest.xml

Clean up task affinity.

2018-09-26 15:23:11 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

DO NOT MERGE Fix color_lint errors

2018-08-28 17:18:49 +00: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

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Migrate Settings to androidx.

2018-08-28 16:35:52 -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%