Doris Ling 9245b98d0f Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev ...

am: 197a10b053

Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96

2018-08-09 12:02:34 -07:00

res

Merge translations of Bluetooth confirmation text

2018-06-04 18:05:34 +00: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

Delete obsolete activity alias for dev settings

2018-06-27 21:53:33 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07: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

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%