Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2
* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2
* commit 'd01767f8b7038108f9125cd2122b117db9919824':
fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2
* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
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 '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2
* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2
* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
update line test to expose some bug on SGX530 ed4
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2
* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2
* commit '3034624f68d373d7c79237425319b5b7fd84317e':
Add -P flag to ps in dumpstate
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2
* 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.
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2
* 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-mr2
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2
* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
process: Add debug code to log process group transitions
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '4cb04c4654e9718a73b378e7b9962dee454efa8d' into eclair-mr2
* commit '4cb04c4654e9718a73b378e7b9962dee454efa8d':
Use image rect information to display zoomed picture.
Merge commit '38a9becfdd23e582571f624b624680cc5938d423' into eclair-mr2
* commit '38a9becfdd23e582571f624b624680cc5938d423':
Import revised translations. DO NOT MERGE
Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2
* commit '04104665271248719cb3659e42938fa4bec0261e':
Fix x offset for boxed textures
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-mr2
* commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0':
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-mr2
* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2
* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
docs: add 2.0 video to developer site feature videos
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-mr2
* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
