jackqdyulei 8ce27bc37c resolve merge conflicts of 758b2d4ae6 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53

2017-06-26 18:30:40 -07:00

res

Dashboard search bar polish

2017-06-26 10:08:44 -07:00

src/com/android/settings

resolve merge conflicts of 758b2d4ae6 to master

2017-06-26 18:30:40 -07:00

tests

resolve merge conflicts of 758b2d4ae6 to master

2017-06-26 18:30:40 -07:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Remove redundant talkback readout when rebooting device"

2017-06-26 22:30:48 +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%