Jeff Sharkey 8a5762d684 am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev ...

automerge: e5c7bae

* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
  Offer to "merge" subscribers for data usage.

2014-12-09 23:16:47 +00:00

res

am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev

2014-12-09 23:15:46 +00:00

src/com/android/settings

am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

2014-12-09 23:16:47 +00: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 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev

2014-12-09 23:15:37 +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%