commit d29f2d263af9a3017799d3098ed208a49c5ecc69
author Adam Powell <adamp@google.com> Wed Jan 09 11:19:22 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 11:19:22 2013 -0800
tree 917f2549a0bae2ac23a8a9ce0a7fa7b819e8c7a4
parent 25505f959cc5faada8f9d2af7784f898439fc264
parent 4dca8636f8c674a7770031c71bc785ef05f22ff9

Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 5dc9da2..e779746 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2838,7 +2838,7 @@
      * item has been selected.
      * <p>
      * It is not safe to hold onto the context menu after this method returns.
-     * {@inheritDoc}
+     *
      */
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
     }

docs/html/distribute/googleplay/promote/badges.jd

diff --git a/docs/html/distribute/googleplay/promote/badges.jd b/docs/html/distribute/googleplay/promote/badges.jd
index c084e2c..0027f59 100644
--- a/docs/html/distribute/googleplay/promote/badges.jd
+++ b/docs/html/distribute/googleplay/promote/badges.jd
@@ -61,7 +61,7 @@
 
 // variables for creating 'try it out' demo button
 var imagePath = "https://developer.android.com/images/brand/"
-var linkStart = "<a href=\"http://play.google.com/store/";
+var linkStart = "<a href=\"https://play.google.com/store/";
 var imageStart = "\">\n"
         + "  <img alt=\"";
   // leaves opening for the alt text value
@@ -70,7 +70,7 @@
 var imageEnd = ".png\" />\n</a>";
 
 // variables for creating code snippet
-var linkStartCode = "&lt;a href=\"http://play.google.com/store/";
+var linkStartCode = "&lt;a href=\"https://play.google.com/store/";
 var imageStartCode = "\"&gt;\n"
         + "  &lt;img alt=\"";
   // leaves opening for the alt text value

docs/html/training/sharing/send.jd

diff --git a/docs/html/training/sharing/send.jd b/docs/html/training/sharing/send.jd
index 15b38e5..9cb8eac 100644
--- a/docs/html/training/sharing/send.jd
+++ b/docs/html/training/sharing/send.jd
@@ -95,7 +95,7 @@
 sendIntent.setAction(Intent.ACTION_SEND);
 sendIntent.putExtra(Intent.EXTRA_TEXT, "This is my text to send.");
 sendIntent.setType("text/plain");
-startActivity(<strong>Intent.createChooser(sendIntent, getResources().getText(R.string.send_to)</strong>);
+startActivity(<strong>Intent.createChooser(sendIntent, getResources().getText(R.string.send_to))</strong>);
 </pre>
 
 <p>The resulting dialog is shown in figure 1.</p>