Ricky Wai 16d93fbae4 Merge "Do not update unified setting before updating primary profile lock" into nyc-dev ...

am: 8e91558

* commit '8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
  Do not update unified setting before updating primary profile lock

Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d

2016-04-12 17:11:05 +00:00

res

Merge "Fix switchbar margin" into nyc-dev

2016-04-12 16:50:32 +00:00

src/com/android/settings

Merge "Do not update unified setting before updating primary profile lock" into nyc-dev

2016-04-12 17:11:05 +00:00

tests

Import translations. DO NOT MERGE

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

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

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

AndroidManifest.xml

TrustedCredentialsSettings should be launched in personal user instead of work user

2016-04-08 15:57:44 +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

Add Tron Logging to portion of A11y SUW that lives in Settings.

2016-04-01 14:34:17 -07:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%