* changes:
docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
Merge commit 'd93447910055565726836a1cdcfc3bad7c95f98c'
* commit 'd93447910055565726836a1cdcfc3bad7c95f98c':
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
Merge commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa'
* commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa':
b/2224837 Changed the plumbing of how alerts/notifications work.
Merge commit 'e065696cd93a454877b44de9b96a033a7553b5ff'
* commit 'e065696cd93a454877b44de9b96a033a7553b5ff':
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
Merge commit 'e9db8335c01aa47799403b59718811ec703cfe61'
* commit 'e9db8335c01aa47799403b59718811ec703cfe61':
check to see if nav cache is up to date on tap
Merge commit 'd980e656baa842592944c6fed371c9b37b2feea9' into eclair-mr2-plus-aosp
* commit 'd980e656baa842592944c6fed371c9b37b2feea9':
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
Merge commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c' into eclair-mr2-plus-aosp
* commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c':
b/2224837 Changed the plumbing of how alerts/notifications work.
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.
Merge commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a' into eclair-mr2-plus-aosp
* commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a':
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
* 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 '07ab85b338d6e08a901a13230ae4cedc57e418ea' into eclair-mr2-plus-aosp
* commit '07ab85b338d6e08a901a13230ae4cedc57e418ea':
Introducing fields for capturing national specifics of contact names.
Merge commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c' into eclair-mr2-plus-aosp
* commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c':
check to see if nav cache is up to date on tap
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
