Zoltan Szatmary-Ban df57fa52ab resolved conflicts for merge of 8eade69d to master ...

Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b

2015-07-08 16:05:49 +01:00

res

am bbd59cc2: am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

2015-07-07 00:32:56 +00:00

src/com/android/settings

resolved conflicts for merge of 8eade69d to master

2015-07-08 16:05:49 +01:00

tests

am d234296b: am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

2015-05-19 10:48:26 +00:00

Android.mk

Allow incremental builds for settings.

2015-04-24 14:35:02 -07:00

AndroidManifest.xml

Hide title of the zen mode voice activity.

2015-06-22 09:53:37 -07: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%