Hansong Zhang 1b7566cd07 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 ...

am: c4127072f4

Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2

2018-04-09 13:43:04 -07: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%