Merge commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05'
* commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit 'a823534008afa45f61faca4088c5aabe9b956117' into eclair-mr2-plus-aosp
* commit 'a823534008afa45f61faca4088c5aabe9b956117':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2
* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp
* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
Revert the channge where channels were not selected randomly.
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Temporarily make a function public that doesn't need to be. When
host gcc-4.0.3 is gone from the build servers we can undo this.
(Cherry-picked from eclair-mr2.)
Merge commit 'a3763b85d4d95a0316df9718bb0d132cf458374d'
* commit 'a3763b85d4d95a0316df9718bb0d132cf458374d':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit '894449ac461e69cd40f10e9d3644555357a5ed82'
* commit '894449ac461e69cd40f10e9d3644555357a5ed82':
update line test to expose some bug on SGX530 ed4
Merge commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd'
* commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '770dc6e5890c70af2b176770539d4afd4e904ff5'
* commit '770dc6e5890c70af2b176770539d4afd4e904ff5':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit '5e6bd56b7c4f237986324662bacb86c07dd9aad0'
* commit '5e6bd56b7c4f237986324662bacb86c07dd9aad0':
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
Merge commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e'
* commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '3e28a1047975d46a2754bb3092344686d3733cfe'
* commit '3e28a1047975d46a2754bb3092344686d3733cfe':
process: Add debug code to log process group transitions
Merge commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28'
* commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '874762f760270694be4fe5d65e6ed65bc79bb846'
* commit '874762f760270694be4fe5d65e6ed65bc79bb846':
Use image rect information to display zoomed picture.
Merge commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1' into eclair-mr2-plus-aosp
* commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp
* commit 'af7d2dda809be2ce43b4b892509648857f09f5e3':
update line test to expose some bug on SGX530 ed4
Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp
* commit '7fb4e4aaf2137474a6abe0d95888e133d4075527':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '2d05af0c8aa252dc1b150395cd42f4f5cbcad392' into eclair-mr2-plus-aosp
* commit '2d05af0c8aa252dc1b150395cd42f4f5cbcad392':
Add -P flag to ps in dumpstate
Merge commit '492dbe17527e27ba712d185a1eac22ae149c67c0' into eclair-mr2-plus-aosp
* commit '492dbe17527e27ba712d185a1eac22ae149c67c0':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05' into eclair-mr2-plus-aosp
* commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05':
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
Merge commit 'cd79e5e173e00995f072104f7a89cf4015a90efd' into eclair-mr2-plus-aosp
* commit 'cd79e5e173e00995f072104f7a89cf4015a90efd':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '574b99bfcd743d35c2d7e656ce46e282c784168e' into eclair-mr2-plus-aosp
* commit '574b99bfcd743d35c2d7e656ce46e282c784168e':
process: Add debug code to log process group transitions
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp
* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '16d8f10ebf75e809cc14d866fded7749363b9d8f' into eclair-mr2-plus-aosp
* commit '16d8f10ebf75e809cc14d866fded7749363b9d8f':
Use image rect information to display zoomed picture.
Merge commit '5cecf74138ea56842463ec384ff04610c1247920' into eclair-mr2-plus-aosp
* commit '5cecf74138ea56842463ec384ff04610c1247920':
Import revised translations. DO NOT MERGE
