1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Merge commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5'
* commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5':
Add support for extracting render time and image in page cycler
Merge commit '949851525a1aebca0d7d6b9a3465d5e572c8c621'
* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'
* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
Add DoCoMo vendor specific OMNA WSP content type number
Merge commit '2aa107917b5a7e6de720a34c4701de55ee9772eb'
* commit '2aa107917b5a7e6de720a34c4701de55ee9772eb':
fix [2291418] Camera preview cannot work in Emulator
Merge commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f'
* commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f':
Some work on issue #2286804: sometimes text field doesn't accept input
Merge commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86'
* commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Merge commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5'
* commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5':
add screenshots for the Bluetooth Chat sample app
Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'
* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
Merge commit 'b2c13d7c8e616d5680260e128b2c31021a160add'
* commit 'b2c13d7c8e616d5680260e128b2c31021a160add':
When passing the Message for saved form data, pass the node pointer properly.
Merge commit '74f7b139d0e380969268f44d5358db08e0325394'
* commit '74f7b139d0e380969268f44d5358db08e0325394':
remove accounts for authenticators that are uninstalled
Merge commit '52d390e8892967c1fad717a00731c0a25e268686'
* commit '52d390e8892967c1fad717a00731c0a25e268686':
Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Merge commit '1e8c96251ca885db700978a3566a67af27099b02'
* commit '1e8c96251ca885db700978a3566a67af27099b02':
In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'
* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
DATE_TAKEN should be in millisecond instead of second.
Merge commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab' into eclair-mr2-plus-aosp
* commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab':
Add support for extracting render time and image in page cycler
Merge commit 'd5b325aaaca7e5197851d26332f48b917d961b9d' into eclair-mr2-plus-aosp
* commit 'd5b325aaaca7e5197851d26332f48b917d961b9d':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Merge commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e' into eclair-mr2-plus-aosp
* commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e':
Add DoCoMo vendor specific OMNA WSP content type number
Merge commit '96dac84be4143d83b13648045b9af31ac0f81004' into eclair-mr2-plus-aosp
* commit '96dac84be4143d83b13648045b9af31ac0f81004':
fix [2291418] Camera preview cannot work in Emulator
Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp
* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
Implement new notification LED blinking logic:
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2
* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [2291418] Camera preview cannot work in Emulator
