Xavier Ducrohet 53b3190a47 am e95a86cf: Merge change 22346 into donut ...

Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)

2009-08-22 07:44:12 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

am 46b133a2: Merge change 20690 into donut

2009-08-11 18:11:50 -07:00

src/com/example/android/apis

Remove unused getConfigSpec methods from ApiDemos sample code

2009-08-21 11:48:50 -07:00

tests

AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:51:42 -07:00

_index.html

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -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

am 46b133a2: Merge change 20690 into donut

2009-08-11 18:11:50 -07:00

default.properties

Fix target for ApiDemos (API is now 4)

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