Merge "Fix Javadoc spelling" into jb-mr1-dev

Fabrice Di Meglio · Android (Google) Code Review · commit bbbb154c8986 · 2012-09-12T17:41:27.000-07:00
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
@@ -5726,7 +5726,7 @@ public void setMarginsRelative(int start, int top, int end, int bottom) {
         /**
          * Sets the relative start margin.
          *
-         * @param start the start marging size
+         * @param start the start margin size
          *
          * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart
          */
@@ -5755,7 +5755,7 @@ public int getMarginStart() {
         /**
          * Sets the relative end margin.
          *
-         * @param end the end marging size
+         * @param end the end margin size
          *
          * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd
          */

Original file line number	Diff line number	Diff line change
`@@ -5726,7 +5726,7 @@ public void setMarginsRelative(int start, int top, int end, int bottom) {`
`5726`	`5726`	`/**`
`5727`	`5727`	`* Sets the relative start margin.`
`5728`	`5728`	`*`
`5729`		`- * @param start the start marging size`
	`5729`	`+ * @param start the start margin size`
`5730`	`5730`	`*`
`5731`	`5731`	`* @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart`
`5732`	`5732`	`*/`
`@@ -5755,7 +5755,7 @@ public int getMarginStart() {`
`5755`	`5755`	`/**`
`5756`	`5756`	`* Sets the relative end margin.`
`5757`	`5757`	`*`
`5758`		`- * @param end the end marging size`
	`5758`	`+ * @param end the end margin size`
`5759`	`5759`	`*`
`5760`	`5760`	`* @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd`
`5761`	`5761`	`*/`