Victor Chang dcb3f2f3fd Merge "Vpn settings per vpn" into nyc-dev ...

am: df21cc7

* commit 'df21cc7de9a6c5543095b0b9eca476b1ff853982':
  Vpn settings per vpn

2016-03-21 13:16:29 +00:00

res

Merge "Vpn settings per vpn" into nyc-dev

2016-03-21 13:16:29 +00:00

src/com/android/settings

Merge "Vpn settings per vpn" into nyc-dev

2016-03-21 13:09:07 +00:00

tests

Import translations. DO NOT MERGE

2016-02-23 09:50:35 -08:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

2016-02-16 17:22:08 -08:00

AndroidManifest.xml

Merge "Follow framework refactoring." into nyc-dev

2016-03-17 22:14:09 +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%