Atanas Kirilov b072779789 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev ...

am: 8994d1f0a4  -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81

2018-06-04 16:59:14 -07:00

res

Import translations. DO NOT MERGE

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

src/com/android/settings

DO NOT MERGE Give PBAP permission only after user confirms

2018-05-30 13:23:53 -07: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

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%