Merge commit '1d448a8f83f78cf48449bb806861224160ff85f9'
* commit '1d448a8f83f78cf48449bb806861224160ff85f9':
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Merge commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd'
* commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd':
Disable menu items based on device/app selection.
Merge commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6'
* commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6':
Create Density based resource values when needed.
Merge commit '9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb' into eclair-plus-aosp
* commit '9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb':
Add cts-media test definition in eclair.
Merge commit 'b824d519146a813dff72f4baa4a1c7abbf78b962'
* commit 'b824d519146a813dff72f4baa4a1c7abbf78b962':
Distinguish jar folders and jar files in ApkBuilder script
Merge commit '265513f5d3388f14c80a46d2fe033e0d93a9fdf1' into eclair-plus-aosp
* commit '265513f5d3388f14c80a46d2fe033e0d93a9fdf1':
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Merge commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp
* commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
Fix possible NPE in DDMS plugin init.
* changes:
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Merge commit 'd582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp
* commit 'd582592ea58188ad3b43523326dda5f9ae2669c7':
Disable menu items based on device/app selection.
Merge commit 'c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp
* commit 'c733a52949c8f98e57ca360cb421f480487ff774':
Force update to the next plugin.
Merge commit '350187ab93e12031ddcd57e5faa2312e6099ebba' into eclair-plus-aosp
* commit '350187ab93e12031ddcd57e5faa2312e6099ebba':
Create Density based resource values when needed.
This will let the layoutlib know when to scale bitmaps
that are not in the native density of the rendering.
Change-Id: I08c99666460b5b5a3ed8d0aac7fa1b7c0136fd6b
Merge commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2' into eclair-plus-aosp
* commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2':
Fix the qualifier match algorithm.
Merge commit 'fa0062da90e158b18a4250a003304bf40832423a' into eclair-plus-aosp
* commit 'fa0062da90e158b18a4250a003304bf40832423a':
Add legacy support for application.package property
application.package in android_rules.xml and android_test_rules.xml has been
replaced by manifest.package which value is taken from AndroidManifest.xml.
This is because old versions of build.properties contain already
application.package property which has precedence over the extracted one
and overrides it.
Change-Id: I909e145926169922ec6ec0e179ad88c413aa85b2
Merge commit 'dd9683a8247c8e14619d068f81d10dea10e4decb' into eclair-plus-aosp
* commit 'dd9683a8247c8e14619d068f81d10dea10e4decb':
Add support for Keyboard state "Soft"
Merge commit '3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp
* commit '3724033353aa535248659ad86f4d4c1c2a10fb75':
Add a new skin to the SDK.
Adds tested.project.dir=".." to ProjectDir/tests/build.properties in order
to indicate automatically that this is a test project and point the
tested project directory.
Merge commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp
* commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
Distinguish jar folders and jar files in ApkBuilder script
