Merge commit '627765245bb89bc590a1cecaaf935414f076618b'
* commit '627765245bb89bc590a1cecaaf935414f076618b':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp
* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80'
* commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80':
Set metadata retriever thread group to the caller's group.
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 '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'
* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
Fix ref counting bug that could cause memory leak in allApps.
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 '4bbdf934458253dbdb331d2b614a085256ba8d6c'
* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'
* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'
* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
Merge commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85'
* commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85':
Add logging of headset events to help debug issue.
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 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8'
* commit 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8':
droiddoc change: add flag to offline docs build to signal
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
