Sanket Padawe 25f2cfe94e am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev ...

* commit '72cedc7af53483dea41eb391613b94b6f0a7226e':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."

2014-12-18 06:38:28 +00:00

res

Import translations. DO NOT MERGE

2014-12-17 06:28:32 -08:00

src/com/android/settings

am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev

2014-12-18 06:38:28 +00:00

tests

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

2014-12-15 16:27:39 +00:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev

2014-12-16 15:44:27 +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%