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 '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 '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.
Merge commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc'
* commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8'
* commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8':
Fix bug 2201417. Whenever the System setting that indicates
Merge commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb'
* commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb':
A better solution for ignoring user activity while the screen is animating off.
Merge commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5'
* commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5':
fix [2143798] Need to figure out how to do video
Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc'
* commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'
* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'
* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
Instead of a raw AIDL interface, give DropBox a Java
Merge commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7' into eclair-mr2-plus-aosp
* commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7':
Fix a race that kept the locale picker from working under heavy CPU load.
