app_Settings

Go to file

Eric Fischer 504539d83c am 8e3c8c20: Merge change I1d016ce3 into eclair

Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp

* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
  Import revised translations.  DO NOT MERGE

2009-10-30 11:17:48 -07:00

res

am 8e3c8c20: Merge change I1d016ce3 into eclair

2009-10-30 11:17:48 -07:00

src/com/android/settings

Merge change Ibe1d06fc into eclair

2009-10-30 12:56:20 -04:00

tests

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

Android.mk

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

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

AndroidManifest.xml

am dd45a47b: Merge change I4d31288f into eclair

2009-10-29 06:35:07 -07: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