Jason Monk 4b32f9f5ad Merge "Don\'t crash on Settings data usage" into nyc-dev ...

am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4

2016-04-29 18:58:41 +00:00

res

Merge "Remove Secure Startup option from Security Settings" into nyc-dev

2016-04-29 17:38:56 +00:00

src/com/android/settings

Merge "Don\'t crash on Settings data usage" into nyc-dev

2016-04-29 18:58:41 +00:00

tests

Import translations. DO NOT MERGE

2016-03-19 04:17:38 +01:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

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

AndroidManifest.xml

Merge "Default payment settings to disabled" into nyc-dev

2016-04-28 12:59:34 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%