Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp
* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp
* commit '235840228b0692b66d854ff499b5c4060f883e03':
Ensure that buffering updates eventually hit 100% after we download everything.
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp
* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
DO NOT MERGE fix null check
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp
* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp
* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
don't try to lock a buffer that wasn't allocated with SW usage bits
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp
* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
Make the default backup configuration "disabled; local transport selected"
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread
* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
Make the default backup configuration "disabled; local transport selected"
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp
* commit '231a0005654d23284ab58a2d9ea892b995988c34':
Avoid allocating buffer every time getThumbnail is called.
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp
* commit '37f709aeb0424948a8f69577c6fad39dc95d7733':
SipProfile: add isOutgoingCallAllowed() and new builder constructor
Merge commit 'bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp
* commit 'bfc9325f8981173db51bc46af0e762dad1341671':
Add support for generated documentation as part of the SDK docs.
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp
* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
Fix the test breakage in vCard tests.
Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp
* commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
Make the default backup configuration "disabled; local transport selected"
Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread
* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
Merge commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp
* commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
fix [2931513] Add support for setting the orientation of an ANativeWindow
Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp
* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
A first shot at proper support for seeking of rtsp streams.
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp
* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
Verify that onPause() calls its superclass.
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp
* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
Fix for an NPE in TextView.