Antony Sargent f224aa6af9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 ...

am: 5943908af4  -s ours

Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150

2018-03-08 19:42:30 +00:00

res

Import translations. DO NOT MERGE

2017-12-18 20:43:20 -08:00

src/com/android/settings

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08

2017-10-31 22:57:12 +00:00

tests

Fix BluetoothPairingDialogTest to not expect device name

2017-12-01 21:21:38 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

resolve merge conflicts of 94c5202965 to oc-dr1-dev

2017-08-30 22:57:39 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%