Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.
Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
Merge commit 'a30c88359f62391b77874b83825a6e400c5100b3'
* commit 'a30c88359f62391b77874b83825a6e400c5100b3':
DO NOT MERGE. Turn down backup logging for release.
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp
* commit '1858031946b3627b599475c5894655362e510351':
DO NOT MERGE. Turn down backup logging for release.
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'
* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
If we encounter video stream EOS while seeking we may still need to seek audio.
Merge commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2'
* commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2':
Fix the incorrect environment variable name for the thread pool size.
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'
* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
Don't force ended when full screen video is returned manually.
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp
* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
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.
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp
* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
Fix some camera orientation javadoc errors.
Merge commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d' into gingerbread-plus-aosp
* commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d':
Fix the incorrect environment variable name for the thread pool size.
Merge commit '453c6d449b6469dde9aae6044dedfe3be0da76c5' into gingerbread-plus-aosp
* commit '453c6d449b6469dde9aae6044dedfe3be0da76c5':
add api level 9 'since' flag to docs
