Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp
* commit '20342ca83012b442913b409a9218635de9bd6aa6':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2
* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp
* commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2
* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp
* commit '2464acc6da6393f0163894094468f68b8e496cea':
moved the gdata library to vendor/google
Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp
* commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2
* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp
* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp
* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
Set metadata retriever thread group to the caller's group.
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2
* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
* changes:
Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp
* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
Fix ref counting bug that could cause memory leak in allApps.
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2
* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
Fix ref counting bug that could cause memory leak in allApps.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp
* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp
* commit '1f52229453c3df8eaeda64133bd332b01589354f':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp
* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp
* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
Add logging of headset events to help debug issue.
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2
* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
Add logging of headset events to help debug issue.
Merge commit '98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp
* commit '98c11248becafa61d29aea8a7e10adf418a6c197':
droiddoc change: add flag to offline docs build to signal
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp
* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
Add window manager support for overriding button and keyboard backlight values.
Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2
* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
droiddoc change: add flag to offline docs build to signal
Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair
* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal
* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp
* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
Expose some debugging tools of the WebView.
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp
* commit '132dab8f91f5e87581660069753f238ea9914732':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
