Geoff Mendal c39909674d am 54960748: (-s ours) am 7eb595bd: (-s ours) am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE ...

* commit '549607480fd6202b142e28b29fcbb6820358b34b':
  Import translations. DO NOT MERGE

2014-10-30 23:55:19 +00:00

res

resolve merge conflicts of 4e4a3f8 to master.

2014-10-30 11:05:55 -07:00

src/com/android/settings

am a0fe2765: am ffc766e0: am 98523c8b: Added Cellular Data for Multi-Sim Data Usage

2014-10-30 23:55:16 +00:00

tests

Import translations. DO NOT MERGE

2014-10-15 18:03:52 -07:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev

2014-10-30 11:06:53 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%