Erik Kline 7d22a9dd78 Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59 ...

am: de272fcd2a  -s ours

Change-Id: Ic79acc4977ea59f92859e41367adc80fc42cb8d9

2017-09-14 08:20:30 +00:00

res

Merge "Settings: Add laser sensor preference" into oc-mr1-dev

2017-09-13 08:40:10 +00:00

src/com/android/settings

Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev

2017-09-14 03:31:27 +00:00

tests

Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev

2017-09-14 03:31:27 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Update icon and string for new device intro suggestion

2017-08-09 13:57:37 -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%