Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp
* commit 'b4805a18e51d3a18caa2cac821479a9535778d58':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.
Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp
* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
Remove external/googleclient (the code moved elsewhere)
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp
* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
Add the example test to the CTS.
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp
* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Merge commit '014b8e0372d85b88eb647be690ae31c6213628bd' into eclair-mr2-plus-aosp
* commit '014b8e0372d85b88eb647be690ae31c6213628bd':
Add a host shell function to generate system_server stack traces
Merge commit '2bfaec8d3299031130330e4b6b32603df6900697' into eclair-mr2-plus-aosp
* commit '2bfaec8d3299031130330e4b6b32603df6900697':
Add the sdk overlay to the build.
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-mr2
* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
Add a host shell function to generate system_server stack traces
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-plus-aosp
* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
Add a host shell function to generate system_server stack traces
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2
* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
Add the sdk overlay to the build.
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-plus-aosp
* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
Add the sdk overlay to the build.
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process. Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).
Depends on adb having been configured to run as root.
Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
Merge commit '753846943dfd32c4dce100743fb143c8eb3119d5' into eclair-mr2-plus-aosp
* commit '753846943dfd32c4dce100743fb143c8eb3119d5':
Clean old DropBoxService.java generated class
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
