Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 483f658e authored Nov 15, 2010 by The Android Automerger

Merge branch 'gingerbread' into gingerbread-release

parents 3afccb8d 305bc0fe

Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,9 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/WiktionarySimple \
		resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
		-samplecode $(sample_dir)/VoiceRecognitionService \
		resources/samples/VoiceRecognitionService "Voice Recognition Service"
		resources/samples/VoiceRecognitionService "Voice Recognition Service" \
		-samplecode $(sample_dir)/NFCDemo \
		resources/samples/NFCDemo "NFC Demo"

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)

data/sounds/notifications/Altair.ogg

100755 → 100644

+486 B (6.86 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

View original file

View changed file

data/sounds/notifications/Capella.ogg

100755 → 100644

−157 B (12.9 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

View original file

View changed file

data/sounds/notifications/Castor.ogg

100755 → 100644

−263 B (14.3 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

View original file

View changed file

data/sounds/notifications/Deneb.ogg

100755 → 100644

−255 B (14.1 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

View original file

View changed file