Merge commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc' into eclair-mr2-plus-aosp
* commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc':
droiddoc change: revise the sample code generating script so that
Merge commit '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-mr2
* commit '0086ab50631cfc6abb0f591871f5bb5da74e4606':
droiddoc change: revise the sample code generating script so that
Merge commit '1a177879281ac6ed541a8f875c0130c3355ab6f9' into eclair
* commit '1a177879281ac6ed541a8f875c0130c3355ab6f9':
droiddoc change: revise the sample code generating script so that
* changes:
droiddoc change: revise the sample code generating script so that all the source code pages are NOT generated for the offline version of the docs (only show source in html for online docs).
Merge commit '31493fc3a0f8ff736b07033fc46dc2d60089a450'
* commit '31493fc3a0f8ff736b07033fc46dc2d60089a450':
docs: change the ADP image for the homepage carousel
Merge commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a' into eclair-mr2-plus-aosp
* commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a':
docs: change the ADP image for the homepage carousel
Merge commit 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-mr2
* commit 'c3467e43febbc39cbb43afe25dd988641e2f0218':
docs: change the ADP image for the homepage carousel
Merge commit '4cdb7149127d9527411ed73e26604a2cf2292435' into eclair
* commit '4cdb7149127d9527411ed73e26604a2cf2292435':
docs: change the ADP image for the homepage carousel
Merge commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b' into eclair-mr2-plus-aosp
* commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b':
Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2
* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).
This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).
Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
Merge commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d'
* commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d':
docs: revise user agent detection to use lower case
Merge commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8' into eclair-mr2-plus-aosp
* commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8':
docs: revise user agent detection to use lower case
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-mr2
* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
docs: revise user agent detection to use lower case
Merge commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair
* commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961':
docs: revise user agent detection to use lower case
Merge commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3' into eclair-mr2-plus-aosp
* commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp
* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
Add the JNI test to the CTS list.
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-mr2
* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2
* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Merge commit '07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp
* commit '07e1232a2dc2887ba0003d629032c21fbb426652':
Update version name to 2.1 and API to 7.
Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'
* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
Include the common source files directly in the framework library
Merge commit '89715318b22014e2a2a683fe4300dffc2dd5e512'
* commit '89715318b22014e2a2a683fe4300dffc2dd5e512':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e'
* commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e':
Fix the Windows SDK build for the development to sdk split.
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'
* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
docs: make all javadoc reference links use <code>
Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp
* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
Include the common source files directly in the framework library
Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp
* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp
* commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
Fix the Windows SDK build for the development to sdk split.
Merge commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp
* commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
Change where makefile looks for sdk_clean.sh
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp
* commit '7239d522c59661129850d818fe6986074b6aa002':
docs: make all javadoc reference links use <code>
Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'
* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
* changes:
Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2
* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2
* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
