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
* 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 'f40abf427e614b850dfb3723622af3e6039a9815'
* commit 'f40abf427e614b850dfb3723622af3e6039a9815':
Expose some debugging tools of the WebView.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field
Needed for bugs:
b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)
Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp
* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
Expose some debugging tools of the WebView.
Merge commit '6ed9c32c04d7f57bf66835c481a17b254762cea3'
* commit '6ed9c32c04d7f57bf66835c481a17b254762cea3':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp
* commit '132dab8f91f5e87581660069753f238ea9914732':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2
* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
Merge commit '4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp
* commit '4103924742c376716ce5866f6d2f53eac4f3cb59':
Fix issue #2267665 IME keyboard appears as Blank in compose view...
