docs: Fixed option for \"launchMode\" within Android manifest doc.

am: 7ce51cf350

Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4

diff --combined docs/html/guide/topics/manifest/activity-element.jd
index a75e231,c2df431..1862529
--- 1/docs/html/guide/topics/manifest/activity-element.jd
--- 2/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@@ -25,7 -25,7 +25,7 @@@ parent.link=manifest-intro.htm
            android:<a href="#hwaccel">hardwareAccelerated</a>=["true" | "false"]
            android:<a href="#icon">icon</a>="<i>drawable resource</i>"
            android:<a href="#label">label</a>="<i>string resource</i>"
-           android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" |
+           android:<a href="#lmode">launchMode</a>=["standard" | "singleTop" |
                                "singleTask" | "singleInstance"]
            android:<a href="#maxRecents">maxRecents</a>="<i>integer</i>"
            android:<a href="#multi">multiprocess</a>=["true" | "false"]
@@@ -714,7 -714,7 +714,7 @@@ For example:</p
  &lt;activity
      android:name="com.example.app.ChildActivity"
      android:label="@string/title_child_activity"
 -    android:parentActivityName="com.example.myfirstapp.MainActivity" >
 +    android:parentActivityName="com.example.app.MainActivity" >
      &lt;!-- Parent activity meta-data to support API level 4+ -->
      &lt;meta-data
          android:name="android.support.PARENT_ACTIVITY"