Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'
* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
Don't force ended when full screen video is returned manually.
Merge commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf'
* commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf':
Cleanspec to fix incremental build failures of the form:
Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e'
* commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e':
Fix bug where home presses were not poking user activity.
Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'
* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
Merge commit '86bf0c7b69856124feb41fb1a938dce1f6695949'
* commit '86bf0c7b69856124feb41fb1a938dce1f6695949':
DO NOT MERGE Add additional options and receiver to BT tests
Merge commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480'
* commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480':
Set the thread pool size of NIST sip stack to one.
Merge commit '5747eebf6eb5ea91480dc576c45c752685383e37'
* commit '5747eebf6eb5ea91480dc576c45c752685383e37':
Pressing the power button quickly needs to turn the screen on and off correctly.
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'
* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
Prevent use of NFC api if device is not featurized for NFC.
Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2'
* commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'
* commit 'ec62719c8396997b436c44906c2760e3914698b8':
Link against the static libcrypto in external/openssl.
Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17'
* commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
This fails beacsue the result of the test is so large that DRT suffers
OOM when reading the result. This will be fixed when we switch to
DRT2. Skipping for now to keep the crashes at zero.
Also fixes bug numbers for other skipped tests
Bug: 2697589
Change-Id: I897ff1f0a2941d305af5fb1c8de8f6690365fb9e
Useful for tweaking touch screen alignment without having to modify the
kernel device driver x/y axis bounds.
Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp
* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
Don't force ended when full screen video is returned manually.
Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83'
* commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83':
Add the HTML5Audio class, to support the audio tag.
Merge commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce' into gingerbread-plus-aosp
* commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce':
Cleanspec to fix incremental build failures of the form:
Merge commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747' into gingerbread-plus-aosp
* commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747':
GPS: Enable some more logging
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp
* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
Fix bug where home presses were not poking user activity.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp
* commit 'd68cda472a3646966a203338ccac04f0783293b7':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
