Merge commit '874762f760270694be4fe5d65e6ed65bc79bb846'
* commit '874762f760270694be4fe5d65e6ed65bc79bb846':
Use image rect information to display zoomed picture.
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 '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.
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.
Merge commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b'
* commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b':
DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp
* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
DO NOT MERGE. Send a message when the picture changes and find is up to search again.
