Wei Wang eeb60f9473 Merge commit 'fc8d2556' into manualmerge ...

Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99

2014-01-14 22:33:21 -08:00

res

Merge commit 'fc8d2556' into manualmerge

2014-01-14 22:33:21 -08:00

src/com/android/settings

Merge "BLE peripheral mode (4/4): Settings change for advertising preference."

2014-01-15 01:43:37 +00:00

tests

Remove deprecated locales

2013-12-09 22:54:15 +00:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

BLE peripheral mode (4/4): Settings change for advertising preference.

2014-01-13 17:41:02 -08: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

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%