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

am: 2a1a5cba81  -s ours

Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d

2018-10-15 16:27:31 -07:00

res

Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a

2018-10-15 10:59:04 -07:00

src/com/android/settings

Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a

2018-10-15 10:59:04 -07:00

tests

Merge "Add null check for vrManager" into pi-dev

2018-10-10 11:07:11 -07: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

Fix color lint baseline.

2018-05-18 20:33:45 +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-27 18:24:23 -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%