am 67bb019c: am 91946fe8: Merge "Add RenderScript samples to the SDK." into honeycomb

* commit '67bb019cc4625169272bbd839f2c81166409cd78':
  Add RenderScript samples to the SDK.
This commit is contained in:
Xavier Ducrohet
2011-01-18 21:59:32 -08:00
committed by Android Git Automerger

View File

@@ -179,6 +179,9 @@ development/apps/WidgetPreview samples/${PLATFORM_NAME}/WidgetPrev
development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary
development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple
development/samples/XmlAdapters samples/${PLATFORM_NAME}/XmlAdapters development/samples/XmlAdapters samples/${PLATFORM_NAME}/XmlAdapters
frameworks/base/libs/rs/java/Balls samples/${PLATFORM_NAME}/RenderScript/Balls
frameworks/base/libs/rs/java/Fountain samples/${PLATFORM_NAME}/RenderScript/Fountain
frameworks/base/libs/rs/java/Samples samples/${PLATFORM_NAME}/RenderScript/MiscSamples
# NOTICE files are copied by build/core/Makefile from sdk.git # NOTICE files are copied by build/core/Makefile from sdk.git
sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt