Merge commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158'
* commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158':
add 'extras' mechanism to OTA and signing tools
Merge commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28' into eclair-mr2-plus-aosp
* commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28':
add 'extras' mechanism to OTA and signing tools
Merge commit '8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-mr2
* commit '8bec09ee7264160e4e08973a0efcc6bd2c898925':
add 'extras' mechanism to OTA and signing tools
Merge commit '8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-plus-aosp
* commit '8bec09ee7264160e4e08973a0efcc6bd2c898925':
add 'extras' mechanism to OTA and signing tools
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 '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-plus-aosp
* 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 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-plus-aosp
* 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
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 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-plus-aosp
* 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 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-mr2
* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp
* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'
* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
docs: make all javadoc reference links use <code>
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp
* commit '7239d522c59661129850d818fe6986074b6aa002':
docs: make all javadoc reference links use <code>
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-plus-aosp
* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-mr2
* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Merge commit '9a5c84020595eac7e20fce036a9afd7c06766457' into eclair
* commit '9a5c84020595eac7e20fce036a9afd7c06766457':
docs: make all javadoc reference links use <code>
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp
* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp
* commit 'd628eacae7af10c520df98323250b385212270ca':
allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2
* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp
* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
If a method is declared by an interface implemented directly by a class,
or indirectly by any of its superclasses, removing a duplicate declaration
is not an API change.
(This fixes the master build, which is currently broken because getOption
and setOption were removed from DatagramSocketImpl because they were
duplicate declarations of the same methods in the implemented interface
SocketOptions.)
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr". Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
