am bbbb154c: Merge "Fix Javadoc spelling" into jb-mr1-dev

* commit 'bbbb154c8986f5c731f159ec6d043945b896183b':
  Fix Javadoc spelling
This commit is contained in:
Fabrice Di Meglio
2012-09-12 17:43:53 -07:00
committed by Android Git Automerger

View File

@@ -5726,7 +5726,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
/** /**
* Sets the relative start margin. * 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 * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart
*/ */
@@ -5755,7 +5755,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
/** /**
* Sets the relative end margin. * 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 * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd
*/ */