app_Settings

Go to file

Eric Fischer 92acdba01c am a640fb4f: Fix the build. A "--" token is not just text in an XML comment.

Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp

* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
  Fix the build.  A "--" token is not just text in an XML comment.

2010-10-21 18:22:09 -07:00

assets/html

String change - wifi tether = hotspot

2010-05-08 17:20:26 -07:00

res

am a640fb4f: Fix the build. A "--" token is not just text in an XML comment.

2010-10-21 18:22:09 -07:00

src/com/android/settings

am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread

2010-10-21 09:37:55 -07:00

tests

am 59091c08: Fix Bluetooth device name max length checking.

2010-09-22 16:26:02 -07:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-05 16:29:09 -08:00

AndroidManifest.xml

am ff8018dc: Merge "Fix NFC permission." into gingerbread

2010-10-20 16:47:25 -07:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -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