Geoff Mendal ea7411bde6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev ...

automerge: 2898f37  -s ours

* commit '2898f37b65b956fb92a0dc67ea5c8afb2c959c6b':
  Import translations. DO NOT MERGE

2015-01-21 15:03:37 +00:00

res

Import translations. DO NOT MERGE

2015-01-19 07:14:45 -08:00

src/com/android/settings

am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev

2015-01-16 02:47:55 +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

[WifiSetup] Don't pan the window for IME

2015-01-15 11:55:15 -08: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%