resolve merge conflicts of c88afb6e to nyc-mr1-dev-plus-aosp

    <ul>

      <li>New <a href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code

      &lt;supports-screens>}</a> element lets you specify the device screen sizes that your

      <supports-screens>}</a> element lets you specify the device screen sizes that your

      application is designed and tested to support, where "size" is a combination

      of resolution and density. If your application is run on a device whose screen

      size is not specified in the <code>&lt;supports-screen&gt;</code> element, the system

    </p>

    </li>

      <li>New <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code &lt;uses-feature>}</a>

      <li>New <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>

        element lets an application specify hardware (or other)

        features that it requires to function normally. When an application

        specifies such features, the system allows the application to be installed only

        </ul>

      </li>

      <li>New attributes for the

      <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code &lt;uses-sdk>}</a> element:

      <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element:

        <ul>

          <li><code>targetSdkVersion</code>: Indicates the API Level that the application is targeting.

          It is able to run on older versions (down to minSdkVersion), but was explicitly tested to

<ul>

<li>Adds the new method {@link

android.speech.tts.TextToSpeech.Engine#getFeatures(java.util.Locale)

android.speech.tts.TextToSpeech#getFeatures(java.util.Locale)

getFeatures()}for querying and enabling network TTS support.

<li>Adds a new listener class, {@link

android.speech.tts.UtteranceProgressListener}, that engines can register to

<p>A new package, {@link android.net.wifi.p2p}, contains all the APIs for performing peer-to-peer

connections with Wi-Fi. The primary class you need to work with is {@link

android.net.wifi.p2p.WifiP2pManager}, which you can acquire by calling {@link

android.app.Activity#getSystemService getSystemService(WIFI_P2P_SERVICE)}. The {@link

android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:</p>

android.app.Activity#getSystemService(java.lang.String) getSystemService(WIFI_P2P_SERVICE)}.

The {@link android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:</p>

<ul>

<li>Initialize your application for P2P connections by calling {@link

android.net.wifi.p2p.WifiP2pManager#initialize initialize()}</li>

android.R.attr#contentDescription android:contentDescription} text is missing or

insufficient. To add more text description to the

{@link android.view.accessibility.AccessibilityEvent}, call {@link

android.view.accessibility.AccessibilityEvent#getText()}.{@link java.util.List#add add()}.</p>

android.view.accessibility.AccessibilityRecord#getText()}.{@link java.util.List#add add()}.</p>

</li>

  <li>At this point, the {@link android.view.View} passes the event up the view hierarchy by calling

{@link android.view.ViewGroup#requestSendAccessibilityEvent requestSendAccessibilityEvent()} on the

<p>Android now allows your app to display unique content on additional screens that are connected

to the user’s device over either a wired connection or Wi-Fi.

 To create unique content for a secondary display, extend the {@link android.app.Presentation}

class and implement the {@link android.app.Presentation#onCreate onCreate()} callback. Within

{@link android.app.Presentation#onCreate onCreate()}, specify your UI for the secondary display

by calling {@link android.app.Presentation#setContentView setContentView()}.

class and implement the {@link android.app.Dialog#onCreate onCreate()} callback. Within

{@link android.app.Dialog#onCreate onCreate()}, specify your UI for the secondary display

by calling {@link android.app.Dialog#setContentView setContentView()}.

As an extension of the {@link android.app.Dialog} class, the {@link

android.app.Presentation} class provides the region in which your app can display a unique UI on the

secondary display.</p>

<p>To detect at runtime when a new display has been connected, create an instance of {@link

android.media.MediaRouter.SimpleCallback} in which you implement the {@link

android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged

android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged

onRoutePresentationDisplayChanged()} callback method, which the system will call when a new

presentation display is connected. Then register the {@link

android.media.MediaRouter.SimpleCallback} by passing it to {@link

android.media.MediaRouter#addCallback MediaRouter.addCallback()} along with the {@link

android.media.MediaRouter#ROUTE_TYPE_LIVE_VIDEO} route type. When you receive a call to

{@link android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged

{@link android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged

onRoutePresentationDisplayChanged()}, simply call {@link

android.media.MediaRouter#getSelectedRoute MediaRouter.getSelectedRoute()} as mentioned above.</p>

likely a different screen density. Because the screen characteristics may different, you should

provide resources that are optimized specifically for such larger displays. If you need

to request additional resources from your {@link

android.app.Presentation}, call {@link android.app.Presentation#getContext()}{@link

android.app.Presentation}, call {@link android.app.Dialog#getContext()}{@link

android.content.Context#getResources .getResources()} to get the {@link

android.content.res.Resources} object corresponding to the display. This provides

the appropriate resources from your app that are best suited for the

  <p>To use a script intrinsic, call the static <code>create()</code> method of each instrinsic

  to create an instance of the script. You then call the available <code>set()</code>

  methods of each script intrinsic to set any necessary inputs and options.

  Finally, call the {@link android.renderscript.ScriptC#forEach forEach()}</code>

  Finally, call the {@link android.renderscript.Script#forEach forEach()}</code>

  method to execute the script.</p>

  </dd>

<p>To track changes to inserts and updates, you can now include the {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP} parameter with your selection to query only the contacts that have changed since the last time you queried the provider.</p>

<p>To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContacts#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.</p>

<p>To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContactsColumns#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.</p>

<p>Additionally, the Contacts Provider now broadcasts the {@link

android.provider.ContactsContract.Intents#CONTACTS_DATABASE_CREATED} action when the user