The Android Automerger 66901d8cb3 merge in master-release history after reset to master

2013-05-20 07:51:44 -07:00

res

Import translations. DO NOT MERGE

2013-05-17 12:20:17 -07:00

src/com/android/settings

am 5675f50c: am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev

2013-05-17 17:41:31 -07:00

tests

Import translations. DO NOT MERGE

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

Android.mk

resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp

2013-04-29 23:30:40 -07:00

AndroidManifest.xml

am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

2013-05-13 14:15:41 -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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%