app_Settings

Go to file

Michael Chan f80de2f5b8 am d1469da1: Merge change I10036c49 into eclair

Merge commit 'd1469da150f44415135d657d57592f066670b317' into eclair-plus-aosp

* commit 'd1469da150f44415135d657d57592f066670b317':
  b/2296110 Disable debugging/logging code before shipping.

2009-12-10 02:44:11 -08:00

res

am e273289c: Merge change Ic0ce5c9a into eclair

2009-12-09 18:10:21 -08:00

src/com/android/settings

Merge change I10036c49 into eclair

2009-12-10 02:41:41 -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 1d5f14bd: Merge change I92124d28 into eclair

2009-12-09 17:47:21 -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