Merge commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563'
* commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563':
Make the Density enum use the int value from the api Density enum.
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 '61676a4061ef0400baa0c75c44a06bf740a55dc6' into eclair-plus-aosp
* commit '61676a4061ef0400baa0c75c44a06bf740a55dc6':
Make the Density enum use the int value from the api Density enum.
This is for both Ant and ADT.
For Ant, also added a check for non-integer values when the platform
is not a preview.
BUG:2118374
Change-Id: Ic8ec533d66a31d9e4b51c9c38b5eaab97bca7414
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
