Geoff Mendal 9c31e3d61f am fde687c3: (-s ours) am 1e637964: (-s ours) am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev ...

* commit 'fde687c3beb95cb0c8dd98bc3eaf5619504e3700':
  Import translations. DO NOT MERGE

2014-10-30 23:55:18 +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

…

NOTICE

…

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%