Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'
* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
Kill off the remaining GC-specific system properties.
Merge commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9'
* commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0'
* commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp
* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
Kill off the remaining GC-specific system properties.
Merge commit 'a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp
* commit 'a7516e90d01a22d17a470695eefa905e0ff066cc':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp
* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Merge commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3' into gingerbread-plus-aosp
* commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3':
Remove fields no longer in API.
Merge commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2' into gingerbread-plus-aosp
* commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2':
There is no @note javadoc tag.
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'
* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
Support new URI structure for download provider.
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
Merge commit '390490e4ae768d541018038c782c52b471bb61de'
* commit '390490e4ae768d541018038c782c52b471bb61de':
DO NOT MERGE - Doclava warnings are now errors.
Merge commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194'
* commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194':
Fixed a bug in the query to the supported profiles and levels
Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp
* commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c':
DO NOT MERGE - Doclava warnings are now errors.
Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp
* commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b':
Fixed a bug in the query to the supported profiles and levels
Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656'
* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp
* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'
* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
This was marked @Deprecated in the docs, but it was misspelled.
Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c'
* commit '03335af0dbf14d1eb4503be92a5b10199719898c':
Fix NPE when handling certain kinds of ANRs.
Merge commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp
* commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7':
This was marked @Deprecated in the docs, but it was misspelled.
