Lorenzo Colitti 060fc11562 resolve merge conflicts of c408ab3de6 to nyc-dev ...

am: 6ef09978ad

* commit '6ef09978adb4c660001ca9cabd6e8b9653d87c18':
  Hide the legacy DHCP client option, since it no longer works.

2016-02-17 14:02:42 +00:00

res

resolve merge conflicts of c408ab3de6 to nyc-dev

2016-02-17 14:02:42 +00:00

src/com/android/settings

resolve merge conflicts of c408ab3de6 to nyc-dev

2016-02-17 22:32:33 +09:00

tests

Import translations. DO NOT MERGE

2016-02-10 07:48:36 -08:00

Android.mk

Revert "Use SetupWizardPreferenceLayout"

2016-02-11 23:17:48 +00:00

AndroidManifest.xml

Merge "Make TetherSettings use the new tether api."

2016-02-05 18:14:50 +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

proguard.flags

Reworks lock screen flows.

2016-02-09 11:58:12 -08: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%