The Android Open Source Project 2a131742f7 am b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge ...

* commit 'b30d81d1dc265b0a1e59d92c996ab9734d272674':

2013-06-03 14:07:22 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-05-31 22:44:05 +00:00

src/com/android/settings

am f96cfad3: am 5ac90432: Don\'t show scan-always text if it is off.

2013-05-30 15:16:05 -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 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

2013-05-20 18:26:12 -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%