summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-03-11 19:18:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 19:18:59 +0000
commitb41c951fb1b2a27d3278948f809e90a7c203ca4b (patch)
tree881701a48a0963c7b310a1f2cb4b41ea1d7ccee6
parent60d18ceaf12ec24cea18d21121845dc4edcd5272 (diff)
parentcb5f813bb642e72777643dcd2bcbd92cc2039388 (diff)
downloadframeworks_base-b41c951fb1b2a27d3278948f809e90a7c203ca4b.zip
frameworks_base-b41c951fb1b2a27d3278948f809e90a7c203ca4b.tar.gz
frameworks_base-b41c951fb1b2a27d3278948f809e90a7c203ca4b.tar.bz2
am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388': Fix doc typos in Vibrator.java
-rw-r--r--core/java/android/os/Vibrator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java
index 6650fca..5d55143 100644
--- a/core/java/android/os/Vibrator.java
+++ b/core/java/android/os/Vibrator.java
@@ -21,11 +21,11 @@ import android.content.Context;
/**
* Class that operates the vibrator on the device.
* <p>
- * If your process exits, any vibration you started with will stop.
+ * If your process exits, any vibration you started will stop.
* </p>
*
* To obtain an instance of the system vibrator, call
- * {@link Context#getSystemService} with {@link Context#VIBRATOR_SERVICE} as argument.
+ * {@link Context#getSystemService} with {@link Context#VIBRATOR_SERVICE} as the argument.
*/
public abstract class Vibrator {
/**