Roman Nurik a10cf9edd8 am affd0f8e: am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread ...

Merge commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe'

* commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe':
  Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.

2010-10-25 14:00:28 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

resolved conflicts for merge of 79ee0a9a to master

2010-10-18 13:56:13 -07:00

src/com/example/android/apis

am affd0f8e: am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread

2010-10-25 14:00:28 -07:00

tests

Remove use of deprecated API from test sample code.

2010-03-18 18:54:57 -07:00

_index.html

SDK doc change: Misc fixes.

2010-01-22 15:18:15 -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

resolved conflicts for merge of efddd2c5 to master

2010-10-05 14:06:01 -07:00