Merge commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f' into eclair-mr2-plus-aosp
* commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f':
Remove the activity restart between urls.
Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp
* commit '6373349836237abffc3de8a3632234170bc1cfca':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp
* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
Add SDK version for MR1.
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-mr2
* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
Remove the activity restart between urls.
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2
* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp
* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
Fix test breakage in testNickNameV21().
Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp
* commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp
* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
Add partial support of Android-specific properties.
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp
* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
Instead of a raw AIDL interface, give DropBox a Java
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp
* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit '02d89898c9b48426d5add48868a640c198a3321f' into eclair-mr2-plus-aosp
* commit '02d89898c9b48426d5add48868a640c198a3321f':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp
* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp
* commit '53976509639b136150a844ff92544f96cf048943':
doc change: fix broken link at top of installing doc
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp
* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp
* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp
* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2
* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2
* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2
* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
doc change: fix broken link at top of installing doc
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2
* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2
* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2
* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp
* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
Add Authentication Type field to the APN settings.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp
* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
