The Android Automerger 07ffb29ff8 merge in master-release history after reset to master

2013-06-10 09:52:51 -07:00

res

wifi-display: change string to "In use" instead of "Busy"

2013-06-07 10:29:34 -07:00

src/com/android/settings

Merge "wifi-display: change string to "In use" instead of "Busy""

2013-06-07 19:20:16 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

Add EventLog to report lock screen type

2013-06-05 13:01:44 -07:00

AndroidManifest.xml

am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

2013-06-07 14:57:38 -07:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08: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

Proguard fix: include notification settings fragment.

2013-02-22 13:17:39 -05:00

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%