Alexey Polyudov e0eaf67f92 fix the build breakage caused by merge resolution ...

am: f689441eed

Change-Id: I1e62efcdb09b82c61f864470d8a5c8079832d74e

2017-02-02 22:06:52 +00:00

res

Merge "Hide ConfigureWifiPreference tiles behind Advanced"

2017-02-02 18:08:47 +00:00

src/com/android/settings

Merge "fix the build breakage cuased by merge resolution"

2017-02-02 21:01:50 +00:00

tests

Merge "Use the fast track calculation for apps."

2017-02-02 20:48:00 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test""

2017-02-02 14:52:16 +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%