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 '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
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 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp
* commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7':
- add javadoc for the account manager
Merge commit 'f545e798ebbe7e081c8e87ad32aa450388364bef'
* commit 'f545e798ebbe7e081c8e87ad32aa450388364bef':
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 '29f043d7424a0b1314aa5d5d13fb27ef57aef067'
* commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067':
don't throw an exception when we can't find a pending sync operation in the database
Merge commit 'cda27c790adc37804ba1940c027621ab232de1b3'
* commit 'cda27c790adc37804ba1940c027621ab232de1b3':
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Merge commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3'
* commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3':
docs: add 2.0 video to developer site feature videos
Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314'
* commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314':
Revive support for video encoding in OMXCodec.
Merge commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718' into eclair-mr2-plus-aosp
* commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718':
divide mRestoredScale before use
Merge commit 'a89a059ea7f4cb3180feaa131eda4713974c3873' into eclair-mr2-plus-aosp
* commit 'a89a059ea7f4cb3180feaa131eda4713974c3873':
Fix x offset for boxed textures
Merge commit '18eedbacac964f200309f99fdfca06a0a01e5bf5' into eclair-mr2-plus-aosp
* commit '18eedbacac964f200309f99fdfca06a0a01e5bf5':
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 '0fca5b45ffe86c1c69359e6eb3727a9953b971c9' into eclair-mr2-plus-aosp
* commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9':
don't throw an exception when we can't find a pending sync operation in the database
Merge commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e' into eclair-mr2-plus-aosp
* commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e':
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp
* commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01':
docs: add 2.0 video to developer site feature videos
Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp
* commit '9ac642a924a85d26fb093a0c4aa0a20817927935':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp
* commit '9dba1f928021450f101013e03deacc9a0506772e':
Revive support for video encoding in OMXCodec.
