summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-28 16:45:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 16:45:16 -0700
commit0de7af1e18a72a979baa9711e4e980b21cf80255 (patch)
tree5b5f1bc27145b63dced5d8029c8f053f37596172 /core/java/android/util
parenta25c43f5545c7d9b7e94f2bb10d64ed7d7302b49 (diff)
parentc9c63003b2e30c068a1bc9eba7683b75ca272180 (diff)
downloadframeworks_base-0de7af1e18a72a979baa9711e4e980b21cf80255.zip
frameworks_base-0de7af1e18a72a979baa9711e4e980b21cf80255.tar.gz
frameworks_base-0de7af1e18a72a979baa9711e4e980b21cf80255.tar.bz2
am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit 'c9c63003b2e30c068a1bc9eba7683b75ca272180': Doc update: misc fixes
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/AttributeSet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/util/AttributeSet.java b/core/java/android/util/AttributeSet.java
index 470526c..74942ba 100644
--- a/core/java/android/util/AttributeSet.java
+++ b/core/java/android/util/AttributeSet.java
@@ -151,7 +151,7 @@ public interface AttributeSet {
* Return the value of 'attribute' as a resource identifier.
*
* <p>Note that this is different than {@link #getAttributeNameResource}
- * in that it returns a the value contained in this attribute as a
+ * in that it returns the value contained in this attribute as a
* resource identifier (i.e., a value originally of the form
* "@package:type/resource"); the other method returns a resource
* identifier that identifies the name of the attribute.
@@ -230,7 +230,7 @@ public interface AttributeSet {
* Return the value of attribute at 'index' as a resource identifier.
*
* <p>Note that this is different than {@link #getAttributeNameResource}
- * in that it returns a the value contained in this attribute as a
+ * in that it returns the value contained in this attribute as a
* resource identifier (i.e., a value originally of the form
* "@package:type/resource"); the other method returns a resource
* identifier that identifies the name of the attribute.