Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp
* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
docs: fix some typos in the manifest docs samples and
* 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.
Instead of processing each notification separately event (scheduling an alarm with AlarmManager for each event, posting notification to NotificationManager for each event, etc), only one alarm should be fired for each wake-up time. AlertService will look through the CalendarAlerts table and decides how to update the notication manager. This is more efficient and simplifies the codecode. It is also the long-term fix to elimiate overlapping notification ring tones e.g. DrooDrooDrooooid b/2194249
Also consolidated alarm scheduling code to one place.
Change-Id: If58ce278d55b28abad703f8aeee466d44952fcd0
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.
