commit 2d40f625c457d93cd7fabb0ca8ea360519f40da9
author Elliott Hughes <enh@google.com> Thu Jan 17 17:02:37 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 17 17:02:50 2013 +0000
tree b3923f2399b25f84f994a014617317835c407795
parent 73d94a30a25aec25e27aa1d0a328f033465461c0
parent e9818ee8dfe0569b17dc81ca62021621d356677b

Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp

docs/html/develop/index.jd

diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index b9c7fa1..c12761b 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -344,7 +344,7 @@
 
 /* Request the playlist feeds from YouTube */
 function showDevelopersLivePlaylist() {
-  var playlistId = "PLB7B9B23D864A55C3"; /* The App Clinic */
+  var playlistId = "PLWz5rJ2EKKc_XOgcRukSoKKjewFJZrKV0"; /* DevBytes */
   var script = "<script type='text/javascript' src='//gdata.youtube.com/feeds/api/playlists/"
                 + playlistId +
                 "?v=2&alt=json-in-script&max-results=10&callback=renderDevelopersLivePlaylist&orderby=published'><\/script > ";

docs/html/guide/topics/resources/more-resources.jd

diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd
index 9fa1a2d..b5f449a 100644
--- a/docs/html/guide/topics/resources/more-resources.jd
+++ b/docs/html/guide/topics/resources/more-resources.jd
@@ -575,7 +575,7 @@
       </dl>
     </dd>
   <dt id="integer-array-item-element"><code>&lt;item&gt;</code></dt>
-    <dd>An integer. The value can be a referenced to another
+    <dd>An integer. The value can be a reference to another
 integer resource. Must be a child of a {@code &lt;integer-array&gt;} element.
       <p>No attributes.</p>
     </dd>

docs/html/guide/topics/resources/string-resource.jd

diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd
index 27761e2..5a96ba1 100644
--- a/docs/html/guide/topics/resources/string-resource.jd
+++ b/docs/html/guide/topics/resources/string-resource.jd
@@ -303,7 +303,7 @@
 
     </dd>
   <dt id="plurals-item-element"><code>&lt;item&gt;</code></dt>
-    <dd>A plural or singular string. The value can be a referenced to another
+    <dd>A plural or singular string. The value can be a reference to another
 string resource. Must be a child of a {@code &lt;plurals&gt;} element. Beware that you must
 escape apostrophes and quotation marks. See <a href="#FormattingAndStyling">Formatting and
 Styling</a>, below, for information about to properly style and format your strings.