summaryrefslogtreecommitdiff
path: root/core/java/android/widget/LinearLayout.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-07-25 15:05:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-25 15:05:18 -0700
commit75bea2e8d35044233ba892bedf102ed08406d653 (patch)
tree8f18eb115430e0ac71f935cdd10562310c8a395d /core/java/android/widget/LinearLayout.java
parent23ecb2cc0bf4c36c72f4b890e9effce5094a2984 (diff)
parent7c00f81606de1880c3f28e54cea064c3b90da3e7 (diff)
am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7': docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
-rw-r--r--core/java/android/widget/LinearLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index 4e114d8d9b6a..ea8532503927 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -41,8 +41,8 @@ import android.widget.RemoteViews.RemoteView;
* {@link android.widget.LinearLayout.LayoutParams LinearLayout.LayoutParams}.
* The default orientation is horizontal.
*
- * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-linearlayout.html">Linear Layout
- * tutorial</a>.</p>
+ * <p>See the <a href="{@docRoot}guide/topics/ui/layout/linear.html">Linear Layout</a>
+ * guide.</p>
*
* <p>
* Also see {@link LinearLayout.LayoutParams android.widget.LinearLayout.LayoutParams}