Wu-cheng Li 0b34a0cfd5 am c5c912e4: Merge change 20717 into donut ...

Merge commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888'

* commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888':
  Release the camera in surfaceDestroyed().

2009-08-11 18:12:14 -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

am c5c912e4: Merge change 20717 into donut

2009-08-11 18:12:14 -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

AI 145097: am: CL 144935 ApiDemos contains new API, and we must force the target to cupcake.

2009-04-08 13:34:04 -07:00