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 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2
* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug 2201417. Whenever the System setting that indicates
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2
* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
added GL test for textured lines
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2
* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
fix [2143798] Need to figure out how to do video
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-mr2
* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
docs: fix broken link for download page.
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2
* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
Explicitly specify that online-sdk depends on framework-res.
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.
* changes:
When upgrading packages with shared user ids make sure we are eliminating the package about to be deleted or upgraded when updating permissions associated with the shared user. Include a simple null check when retrieving the permission.
Merge commit '80b6367dc6e2c6339884eed5b16f462289eb28b7'
* commit '80b6367dc6e2c6339884eed5b16f462289eb28b7':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '838bb9893182b1be5a64226f0a6fd7e953815ec6'
* commit '838bb9893182b1be5a64226f0a6fd7e953815ec6':
doc change: fix broken link at top of installing doc
Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'
* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit '687545fc9ee79124229152df1236c53ba7d71215'
* commit '687545fc9ee79124229152df1236c53ba7d71215':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674'
* commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'
* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
Add Authentication Type field to the APN settings.
Merge commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16'
* commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '20fcfac829f4919157bd986cdae29f27669f99dc'
* commit '20fcfac829f4919157bd986cdae29f27669f99dc':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6'
* commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
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
* changes:
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
