Dirk Dougherty a276296490 Merge commit 'e897c1b4' into manualmerge ...

Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html

2009-12-15 23:27:22 -08:00

..

assets

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

res

am dcf99fbe: Merge change If4ff28ed into eclair-mr2

2009-12-10 16:58:46 -08:00

src/com/example/android/apis

Merge commit 'e897c1b4' into manualmerge

2009-12-15 23:27:22 -08:00

tests

Define tested.project.dir property for existing samples

2009-09-23 12:15:05 -07:00

_index.html

docs: make the apidemos app index page only display the

2009-11-20 14:55:07 -08:00

Android.mk

Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.

2009-06-19 18:34:39 -07:00

AndroidManifest.xml

Simple Matrix Palette skinning sample.

2009-12-09 18:35:19 +08:00