summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-02 08:09:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-02 08:09:07 -0700
commit8b13ed701b08a6540a960c0d4370751a5f657978 (patch)
treee0c9f7477cc007a9e65df8d0cabbbe926d02a637
parent37b4a3c2f2e85701f06e85b7240f1c724f8d2dea (diff)
parent4edd80db956a6a3fc1142371d098ad2abd06ac9c (diff)
downloadframeworks_base-8b13ed701b08a6540a960c0d4370751a5f657978.zip
frameworks_base-8b13ed701b08a6540a960c0d4370751a5f657978.tar.gz
frameworks_base-8b13ed701b08a6540a960c0d4370751a5f657978.tar.bz2
am 4edd80db: am ee34a49f: Add missing word from docs.
Merge commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c' * commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c': Add missing word from docs.
-rw-r--r--core/java/android/app/Service.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java
index b7a750b..00063af 100644
--- a/core/java/android/app/Service.java
+++ b/core/java/android/app/Service.java
@@ -403,7 +403,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
*
* <p class="caution">Note that the system calls this on your
* service's main thread. A service's main thread is the same
- * thread where UI operations place for Activities running in the
+ * thread where UI operations take place for Activities running in the
* same process. You should always avoid stalling the main
* thread's event loop. When doing long-running operations,
* network calls, or heavy disk I/O, you should kick off a new