Merge commit '0c012efaab175a46df0cb217e639f414495e4a1b'
* commit '0c012efaab175a46df0cb217e639f414495e4a1b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp
* commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2
* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit '1de953aee53db0d3040cf242b20e9340787725c5' into eclair-mr2-plus-aosp
* commit '1de953aee53db0d3040cf242b20e9340787725c5':
fix the "right icon" in the titlebar
Merge commit '9780c40335e3909c7550cab97d82ca452141aa97'
* commit '9780c40335e3909c7550cab97d82ca452141aa97':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit 'e48ede2bb49244400be95f5f4e9967ab77cfcd8b'
* commit 'e48ede2bb49244400be95f5f4e9967ab77cfcd8b':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '1e262628f3ba7115a46a1a7fe0157e65fb5db001'
* commit '1e262628f3ba7115a46a1a7fe0157e65fb5db001':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '70de03d41374aa3f4d3308d5d44e1db908d22667' into eclair-mr2-plus-aosp
* commit '70de03d41374aa3f4d3308d5d44e1db908d22667':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '70271e3bbda03225a64ff70c833d97829fc0ac1c' into eclair-mr2-plus-aosp
* commit '70271e3bbda03225a64ff70c833d97829fc0ac1c':
Import revised translations. DO NOT MERGE
Merge commit '10a1600673c6a7c3b02c3996ba6b46ef884563ad' into eclair-mr2-plus-aosp
* commit '10a1600673c6a7c3b02c3996ba6b46ef884563ad':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611' into eclair-mr2-plus-aosp
* commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit 'c0e1bb88fd3029ad8a6ab4587da7bcfb127100c7'
* commit 'c0e1bb88fd3029ad8a6ab4587da7bcfb127100c7':
If we fail to persist the current settings and fall back to the back settings file
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2
* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2
* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp
* commit '6d924c69af055559ed84afaf487aa38bd6fd2e33':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2
* commit '785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Merge commit 'f25c96609224213be07a34219a32c006ee9063f0'
* commit 'f25c96609224213be07a34219a32c006ee9063f0':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp
* commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '337b2cd674e084807cb0656b6609aae3dd02d2c0'
* commit '337b2cd674e084807cb0656b6609aae3dd02d2c0':
Add a new API for initing Wifi multicast filtering
Merge commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315' into eclair-mr2-plus-aosp
* commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315':
Add a new API for initing Wifi multicast filtering
Merge commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a'
* commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a':
Make MockCursor class a part of public SDK.
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp
* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
Make MockCursor class a part of public SDK.
Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330'
* commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.
Internal Issue number: 2181010
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
