Geoff Mendal 849673eddd am 26a3e949: (-s ours) Import translations. DO NOT MERGE ...

automerge: 808ac6c  -s ours

* commit '808ac6cd14ee4061adc49d78f218a0f4142c153d':
  Import translations. DO NOT MERGE

2015-01-26 15:20:04 +00:00

res

Import translations. DO NOT MERGE

2015-01-21 06:55:59 -08:00

src/com/android/settings

am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9

2015-01-24 00:06:37 +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%