app_Settings

Go to file

Jaikumar Ganesh 36305d01f2 am f74e344d: am 9f1d9c16: (-s ours) Merge change I9a1ed7e4 into eclair

Merge commit 'f74e344df00da63e866182cad7b6fe1cd372e779' into eclair-mr2-plus-aosp

* commit 'f74e344df00da63e866182cad7b6fe1cd372e779':
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.

2009-12-02 16:14:10 -08:00

res

am 1a8cb120: am e2caf2ee: Merge change I82be95f6 into eclair

2009-12-02 15:51:24 -08:00

src/com/android/settings

am e2caf2ee: Merge change I82be95f6 into eclair

2009-12-02 15:47:19 -08:00

tests

Import revised translations. DO NOT MERGE

2009-11-16 16:45:29 -08:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:14 -07:00

AndroidManifest.xml

am 4cb03801: Merge change Ia74e2b5c into eclair-mr2

2009-11-30 10:40:09 -08: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