Yohann Roussel 89fea15a84 resolve merge conflicts of 1104b94dbc to master ...

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

2017-06-06 12:06:45 +00:00

res

Merge "Ensure wifi ssid cannot exceed 32 bytes."

2017-06-06 06:33:49 +00:00

src/com/android/settings

resolve merge conflicts of 1104b94dbc to master

2017-06-06 12:06:45 +00:00

tests

resolve merge conflicts of 1104b94dbc to master

2017-06-06 12:06:45 +00:00

Android.mk

Initial search bar implementation.

2017-05-31 15:24:25 -07:00

AndroidManifest.xml

Merge "Update suggestion rules and string description"

2017-06-04 03:24:53 +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%