summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2009-11-24 09:45:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-24 09:45:09 -0800
commit0d2feb0d7355e6bb6235053a162aa8d6b770deeb (patch)
tree23b56dbecb4911f841efdb45271f74903b1f1882
parentf5f38bec1a1c40fbe717f1aabe85e18e21c03810 (diff)
parent82d4b5ccaf5518ed9286d89e60ac9a595239ac35 (diff)
downloadframeworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.zip
frameworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.tar.gz
frameworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.tar.bz2
am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp * commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35': Fixing minor doc typo in android.widget.SimpleCursorAdapter.
-rw-r--r--core/java/android/widget/SimpleCursorAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/SimpleCursorAdapter.java b/core/java/android/widget/SimpleCursorAdapter.java
index b6a49e5..436b79b 100644
--- a/core/java/android/widget/SimpleCursorAdapter.java
+++ b/core/java/android/widget/SimpleCursorAdapter.java
@@ -74,7 +74,7 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter {
* @param context The context where the ListView associated with this
* SimpleListItemFactory is running
* @param layout resource identifier of a layout file that defines the views
- * for this list item. Thelayout file should include at least
+ * for this list item. The layout file should include at least
* those named views defined in "to"
* @param c The database cursor. Can be null if the cursor is not available yet.
* @param from A list of column names representing the data to bind to the UI. Can be null