Merge commit '20583ff9d49257bd4ccc60e7b6337661e34ed887'
* commit '20583ff9d49257bd4ccc60e7b6337661e34ed887':
Fix issue #2015611: layering problem when moving an activity to the foreground.
* changes:
Refix the MT call screen stuck issue. The issue this change fixes can be reproduced by following steps: 1. Originate and connect a call to remote party #1 that is not in Contacts. 2. Receive a call from the remote party #2 that is not in Contacts, the call waiting tone is sounded and the call waiting screen is displayed. 3. Press menu key and ignore the call, and the call waiting screen is dismissed and the remote party #2 is forwarded to voice mail. When we ignore the incoming call, Phone gets stuck with incoming call screen.
Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'
* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
Merge commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09'
* commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09':
Fixing bug #2008185 - problem with the TTS dropping
* changes:
Fixing bug #2008185 - problem with the TTS dropping utterances under heavy load was caused by the speech queue being locked. Switched to using a timeout with tryLock so that the TTS service does not give up immediately.
Merge commit '95fa929ebe55b3745eb59a1c4b8f21cb9f8e6b1d'
* commit '95fa929ebe55b3745eb59a1c4b8f21cb9f8e6b1d':
New small rating stars from the UI designers.
Merge commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c'
* commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c':
Fiddle with default densities to try to sanitize the API.
Merge commit 'ba989ad0ed91beda010d44945fa015d75d99cf67'
* commit 'ba989ad0ed91beda010d44945fa015d75d99cf67':
Use the old string for bookmarks permissions.
Merge commit '6ddaa3497ce7af2c303771365449501e2be52511'
* commit '6ddaa3497ce7af2c303771365449501e2be52511':
Send max displayed position in search dialog click event
Merge commit '11b6a29dfe380c97fa3df67a6b97ff3383592b58'
* commit '11b6a29dfe380c97fa3df67a6b97ff3383592b58':
AI 150594: change the homepage markup and styles to allow variable height in
AI 150587: add a sitemap for translated docs, for submission to Webmaster Tools,
AI 150541: roll the docs forward to 1.5 r3
AI 150538: add note that appwidget updates will wake the device and suggest an alarm
AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
AI 150535: add the Videos page to the site
Merge commit '1dc8c62c5078f1598cc906de1b97b572cc3449a3'
* commit '1dc8c62c5078f1598cc906de1b97b572cc3449a3':
AI 150506: Fix some date format problems by switching cupcake over to using
Merge commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15'
* commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15':
AI 150460: Add missing art files for menu_guidelines doc.
AI 150397: turn off the right arrow in the carousel -- we only have 3 items.
AI 150390: Roll the docs back to 1.5 r2, temporarily.
AI 150381: Add localized content (ja2) to developer site.
AI 150380: Add localized content (ja) for developer site.
AI 150369: Add localized TOCs for developer site.
AI 150351: Doc updates for Android 1.5 SDK r3.
Merge commit 'b4fc70fcc9d8060bd4baf86294f6bc4aa0b1be49'
* commit 'b4fc70fcc9d8060bd4baf86294f6bc4aa0b1be49':
AI 150335: Removed the links to wikipedia.
Merge commit 'd5aa644f59f254133101369d71ec3fcea4baf33b'
* commit 'd5aa644f59f254133101369d71ec3fcea4baf33b':
AI 150304: Import a bunch of revised translations.
Merge commit '7d41c8dee1d5b789a9ecfab65929237c603f2a40'
* commit '7d41c8dee1d5b789a9ecfab65929237c603f2a40':
AI 150245: Import and add to the l10n builds new and updated translations for:
Merge commit '1f4dd5d6ca82bee7c2ac257d61b373f80dcc1354'
* commit '1f4dd5d6ca82bee7c2ac257d61b373f80dcc1354':
AI 150106: Add gcc/gmake/cygwin details to NDK sys requirements
AI 150083: Minor updates to the ndk docs based on approved messaging.
AI 150055: In Icon Guidelines doc, remove example icons that are not accessible to apps.
AI 150054: Misc changes for the sdk/devsite docs
AI 150008: update the Google IO announcement, point to session videos.
Merge commit '07ee3fdaea879fb568ab3263102766b46130ce56'
* commit '07ee3fdaea879fb568ab3263102766b46130ce56':
DO NOT MERGE. Already in master. Fix#1977876 : Key preview in WVGA broken.
Merge commit '4ca6659fe4c8299f886eba7f745bed509be8126b'
* commit '4ca6659fe4c8299f886eba7f745bed509be8126b':
Fixing bug 2003639 - this is a fix to prevent the AccessibilityManagerService
