Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-plus-aosp
* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-plus-aosp
* 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 '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-plus-aosp
* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-plus-aosp
* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
update line test to expose some bug on SGX530 ed4
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-plus-aosp
* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-plus-aosp
* commit '3034624f68d373d7c79237425319b5b7fd84317e':
Add -P flag to ps in dumpstate
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-plus-aosp
* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
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.
* changes:
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 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-plus-aosp
* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-plus-aosp
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-plus-aosp
* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
process: Add debug code to log process group transitions
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
* changes:
When upgrading packages with shared user ids make sure we are eliminating the package about to be deleted or upgraded when updating permissions associated with the shared user. Include a simple null check when retrieving the permission.
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.
Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
Merge commit '4cb04c4654e9718a73b378e7b9962dee454efa8d' into eclair-plus-aosp
* commit '4cb04c4654e9718a73b378e7b9962dee454efa8d':
Use image rect information to display zoomed picture.
Merge commit '38a9becfdd23e582571f624b624680cc5938d423' into eclair-plus-aosp
* commit '38a9becfdd23e582571f624b624680cc5938d423':
Import revised translations. DO NOT MERGE
