Baligh Uddin 15885f4998 Merge commit '99d5938c' ...

Resolve conflict per ag/326799

Conflicts:
	AndroidManifest.xml

2013-08-01 15:04:30 -07:00

res

Merge "Add Strings for the new high power location monitoring app op."

2013-08-01 19:26:08 +00:00

src/com/android/settings

Merge "Add Strings for the new high power location monitoring app op."

2013-08-01 19:26:08 +00:00

tests

Import translations. DO NOT MERGE

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

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Merge commit '99d5938c'

2013-08-01 15:04:30 -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%