Hansong Zhang bba13e58c2 [automerger skipped] [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 am: 1b7566cd07 am: af077f8d4c -s ours am: 3369767245 ...

am: 9b8c565932  -s ours

Change-Id: I1bea1a448450fd0929570c8238d31cc1d743d6c1

2018-04-09 14:41:01 -07:00

res

Merge "Remove gear from usb preference" into pi-dev am: 631ee514ae

2018-04-09 12:54:19 -07:00

src/com/android/settings

Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev am: 8064782d77

2018-04-09 13:57:29 -07:00

tests

Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8

2018-04-09 13:18:48 -07:00

Android.mk

Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

2018-04-04 16:45:09 -07:00

AndroidManifest.xml

Updates to match prebuilts drop

2018-04-04 16:08:17 -04:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Update color whitelist for check color repohook

2018-04-02 11:32:06 -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

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

2018-04-04 16:45:09 -07: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%