app_Settings

Go to file

Fabrice Di Meglio bfda99df5a Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10 automerge: e6a4a6b

automerge: 570bd52

* commit '570bd52f30cd455c9042361c6124ab0e00d91f6e':
  Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

2014-10-16 22:49:42 +00:00

res

Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10 automerge: e6a4a6b

2014-10-16 22:49:42 +00:00

src/com/android/settings

Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10 automerge: e6a4a6b

2014-10-16 22:49:42 +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 f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

2014-10-15 21:23:51 +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