Jeff Davidson 06b65d1c7d resolve merge conflicts of 0c7e4ed to master. ...

Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9

2014-12-09 15:11:44 -08:00

res

am 361681e2: am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev

2014-12-09 00:55:47 +00:00

src/com/android/settings

resolve merge conflicts of 0c7e4ed to master.

2014-12-09 15:11:44 -08:00

tests

Import translations. DO NOT MERGE

2014-12-08 06:51:46 -08:00

Android.mk

Settings psuedolocalization fixes.

2014-08-22 12:24:00 -07:00

AndroidManifest.xml

am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev

2014-12-09 00:55:48 +00:00

CleanSpec.mk

Finally, a place for notification settings.

2014-03-12 14:15:09 -04: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

VolumeZen: Sound & Notifications settings.

2014-05-18 15:37:09 -04:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%