Jason Monk 183fcd5370 am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev ...

* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

2015-08-04 21:03:38 +00:00

res

am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

2015-08-04 21:03:38 +00:00

src/com/android/settings

am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

2015-08-04 21:03:38 +00:00

tests

Import translations. DO NOT MERGE

2015-07-23 18:10:24 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-27 21:16:03 +00:00

AndroidManifest.xml

Merge "Let Settings measure transient free space." into mnc-dev

2015-07-31 01:46: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 option to reset network settings to factory

2015-03-09 13:18:50 -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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%