Scott Main 75239b5177 am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk ...

Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp

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

2009-11-23 10:18:24 -08:00

..

assets

auto import from //depot/cupcake/@135843

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

res

merge from open-source master

2009-10-14 16:02:09 -07:00

src/com/example/android/apis

am d22a3d97: Revert "update demo to use boundary patch"

2009-10-28 14:16:28 -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