Merge commit '5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-plus-aosp
* commit '5f9e0abed17ab1197a0868729232cb2c2024cef2':
Rename the layout device from ION to ADP2.
The preview size will be checked now in Camera HAL. So, we change the code to
get the supported preview sizes and find one of the size that match the
surface's width and height.
Merge commit 'c02bfe5e77b84b82f3830f00554be5e735486850'
* commit 'c02bfe5e77b84b82f3830f00554be5e735486850':
eclair snapshot
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit 'c68f8c10f49e110b9b731d5f0c96acaf564b8ed5'
* commit 'c68f8c10f49e110b9b731d5f0c96acaf564b8ed5':
Move source.properties for doc in sync with 2.0.1
Merge commit 'aab6b89debd56304b2fdde39292f36149a11f728'
* commit 'aab6b89debd56304b2fdde39292f36149a11f728':
Move source.properties for platform in sync with 2.0.1
Merge commit '8507ead2e565728e53e6f3c54be05fd21baab7d2' into eclair-mr2-plus-aosp
* commit '8507ead2e565728e53e6f3c54be05fd21baab7d2':
Move source.properties for doc in sync with 2.0.1
Merge commit '2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp
* commit '2e533cc0448af6e2add7ab346ff451dde79c1ced':
Move source.properties for platform in sync with 2.0.1
Merge commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2
* commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Merge commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-plus-aosp
* commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-plus-aosp
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
This change fixes some formatting artifacts that resulted from the export from
Sites, and also updates links to no longer point to Sites and use the standard
{@docRoot} idiom. Also contains a few content updates, and introduces a page
about branch management.
Merge commit '1591827e470544eff8057b61c0be51acb8b57b95'
* commit '1591827e470544eff8057b61c0be51acb8b57b95':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a' into eclair-mr2-plus-aosp
* commit '37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-mr2
* commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-plus-aosp
* commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1' into eclair
* commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit 'd4929cfa19edd45f5b819400c5e221a2687a294d'
* commit 'd4929cfa19edd45f5b819400c5e221a2687a294d':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit '250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp
* commit '250153e8257188269bb171bb333975860bcc1d36':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-plus-aosp
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
