summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-10-31 11:21:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-31 11:21:24 -0700
commitf101a85bc3210b3c0ae9c916dd8fbdf88282caad (patch)
tree1381d792bfc7c7c072fd729f2e52f95c4dfb115a /core
parentc6b7b2dfaaab2cd8ec1940a4515b15433c83d190 (diff)
parentcee8d1d3450fb2b7490fbe41bf8b3f974c015f6f (diff)
downloadframeworks_base-f101a85bc3210b3c0ae9c916dd8fbdf88282caad.zip
frameworks_base-f101a85bc3210b3c0ae9c916dd8fbdf88282caad.tar.gz
frameworks_base-f101a85bc3210b3c0ae9c916dd8fbdf88282caad.tar.bz2
am cee8d1d3: Merge "fix typo"
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f': fix typo
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/AbsoluteLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsoluteLayout.java b/core/java/android/widget/AbsoluteLayout.java
index b829655..970cbe3 100644
--- a/core/java/android/widget/AbsoluteLayout.java
+++ b/core/java/android/widget/AbsoluteLayout.java
@@ -187,7 +187,7 @@ public class AbsoluteLayout extends ViewGroup {
* </ul>
*
* @param c the application environment
- * @param attrs the set of attributes fom which to extract the layout
+ * @param attrs the set of attributes from which to extract the layout
* parameters values
*/
public LayoutParams(Context c, AttributeSet attrs) {