Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp
* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
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
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.
Merge commit '07cca294a362450a5fc86e372d77503daab11eb1' into eclair-mr2-plus-aosp
* commit '07cca294a362450a5fc86e372d77503daab11eb1':
Add CertInstaller to the SDK.
Merge commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2
* commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a':
Add CertInstaller to the SDK.
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.
This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.
TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp
* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
directories since the Android.mk files will not be found in these
directories.
Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp
* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
add the new accounts and sync package to the generic target and enable sync for all builds
Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2
* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
Merge commit '5243b109acec2b03431aef36ccc42256b77ae316' into eclair-mr2-plus-aosp
* commit '5243b109acec2b03431aef36ccc42256b77ae316':
WebKit clean required by move of V8 to external/v8.
Merge commit '747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp
* commit '747f2997f1ddeac97090ce1d94d04eed9cffc529':
docs: revise resizing scripts to better organize the
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2
* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
docs: revise resizing scripts to better organize the
Merge commit '3f7d1df12938b6db9849b03c05d5a56784ee147b' into eclair
* commit '3f7d1df12938b6db9849b03c05d5a56784ee147b':
docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.
Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.
There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.
Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
Merge commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp
* commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
docs: fix js error when there's no api level cookie saved.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2
* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
docs: fix js error when there's no api level cookie saved.
Merge commit '64b879ac5bbabe0489869f76b3a20f26aca6ce22' into eclair
* commit '64b879ac5bbabe0489869f76b3a20f26aca6ce22':
docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
Merge commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp
* commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2
* commit '32b505d984ed15156b87482f849b865892b57ac2':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '8e44ae9c762785d80e54bc75e2ba353f486414ec' into eclair
* commit '8e44ae9c762785d80e54bc75e2ba353f486414ec':
docs: fix IE6 bug in which tabs are not focusable
Merge commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp
* commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f':
docs: add checkbox to toggle the api level filter on and off;
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2
* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
docs: add checkbox to toggle the api level filter on and off;
Merge commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d' into eclair-mr2-plus-aosp
* commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d':
Clean frameworks after replacing IDropBox.aidl with
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp
* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
Bump version to 2.1 API 6.
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.
(Will be checked in immediately after the change in question)
