Jack Palevich 3328b18293 am 494bb69b: Merge change I79297bbe into eclair-mr2 ...

Merge commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810'

* commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
  Turn of log message that was accidentally left on in an earlier commit.

2009-10-13 12:11:19 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

am c2c1efc0: Merge change I27666897 into eclair-mr2

2009-10-12 11:32:55 -07:00

src/com/example/android/apis

am 494bb69b: Merge change I79297bbe into eclair-mr2

2009-10-13 12:11:19 -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 transition animation sample, log to service sample.

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