app_Settings

Go to file

Eric Fischer f7660bc7b3 am bf777ba8: (-s ours) am 2b42f028: am 8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair

Merge commit 'bf777ba89ccce0f6804a3a58daff1bbc767f7071'

* commit 'bf777ba89ccce0f6804a3a58daff1bbc767f7071':
  Import revised translations.  DO NOT MERGE

2009-11-01 21:51:36 -08:00

res

am 69b4dec0: am 8b643d94: am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator

2009-10-29 20:14:34 -07:00

src/com/android/settings

am fd07eb22: Merge change Ibe1d06fc into eclair

2009-10-30 10:02:57 -07: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 a8a974bd: am dd45a47b: Merge change I4d31288f into eclair

2009-10-29 19:54:53 -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