Piotr Gurgul 284e84b677 am 95a32505: Merge change 26649 into eclair ...

Merge commit '95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp

* commit '95a32505be164e0424d01fdd2b06c04cd54e6f06':
  Define tested.project.dir property for existing samples

2009-09-23 15:38:33 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

am 0c12e21a: Merge change 23532 into eclair

2009-09-01 17:33:25 -07:00

src/com/example/android/apis

merge from open-source master

2009-09-01 08:27:45 -07:00

tests

Define tested.project.dir property for existing samples

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

_index.html

docs only.

2009-08-24 15:27:00 -07: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 sample of correctly requesting camera feature, optional shared lib.

2009-08-27 20:13:19 -07:00

default.properties

Fix target for ApiDemos (API is now 4)

2009-08-21 15:59:02 -07:00