Colin Cross c19d2bccbf Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am: 450f423a21 -s ours ...

am: bfab966085  -s ours

Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549

2017-08-31 22:43:03 +00:00

res

Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506

2017-08-31 20:23:27 +00:00

src/com/android/settings

Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1

2017-08-31 19:54:20 +00:00

tests

Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa

2017-08-30 17:21:30 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e

2017-08-10 02:31:39 +00: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%