Merge commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa'
* commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa':
Avoid a crash trying to get a substring whose start is after its end.
Merge commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c'
* commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c':
Adding list of articles to docs/html/resources/articles/index.jd.
Merge commit '479a49f74f77855825ba69b105c065422c24246a'
* commit '479a49f74f77855825ba69b105c065422c24246a':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
* changes:
Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp
* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp
* commit '725218602e8505cd6fe3075253fcb792727e2431':
Avoid a crash trying to get a substring whose start is after its end.
Merge commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48' into eclair-plus-aosp
* commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48':
Adding list of articles to docs/html/resources/articles/index.jd.
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp
* commit '7585586ce5b5de699b95125672e29eaf70876727':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Merge commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083' into eclair-mr2-plus-aosp
* commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083':
Provide localized strings for <input> labels.
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp
* commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f':
moved the hidden sync helpers out of the framework
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'
* commit '83652ebfe1963bcecdcf24383165904223baca6e':
Implement API to have new broadcasts replace existing broadcasts.
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp
* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
Implement API to have new broadcasts replace existing broadcasts.
Merge commit '08e2106a19a034670287374d96d671495e4ffc5f'
* commit '08e2106a19a034670287374d96d671495e4ffc5f':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp
* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
Merge commit 'dc7294d94dba213727c1956774466707e58a8784'
* commit 'dc7294d94dba213727c1956774466707e58a8784':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
Merge commit '354cf96792196ce0fec358a573d2621ad2ab0788'
* commit '354cf96792196ce0fec358a573d2621ad2ab0788':
The software AVCDecoder now properly seeks as requested.
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp
* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
Fixed class paths in layout xml files
Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp
* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
Merge commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb' into eclair-mr2-plus-aosp
* commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb':
The software AVCDecoder now properly seeks as requested.
* changes:
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
