summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-03-11 17:43:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 17:43:46 +0000
commitcb5f813bb642e72777643dcd2bcbd92cc2039388 (patch)
treef0e64b472f5c009bab03411d2d796f0cc81e5c1b
parent212075889eab9aab2c48881803888a1b827d77ba (diff)
parent0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab (diff)
downloadframeworks_base-cb5f813bb642e72777643dcd2bcbd92cc2039388.zip
frameworks_base-cb5f813bb642e72777643dcd2bcbd92cc2039388.tar.gz
frameworks_base-cb5f813bb642e72777643dcd2bcbd92cc2039388.tar.bz2
am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab': 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 {
/**