Scott Main 7baf25521c am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk ...

Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp

* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
  docs: make the apidemos app index page only display the

2009-11-23 10:13:07 -08:00

..

assets

auto import from //depot/cupcake/@135843

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

res

am 6f53211d: Merge change Ie022d478 into eclair

2009-09-29 18:01:01 -07:00

src/com/example/android/apis

am bad9ac7f: Merge change 27163 into eclair

2009-09-25 16:20:56 -07: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

Add transition animation sample, log to service sample.

2009-09-25 16:10:42 -07:00