summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2015-04-08 18:23:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-08 18:23:52 +0000
commitb49748cfd3a4f87c394307787665c09521faa77d (patch)
tree92f1b95f98742dc0739fe73a378f4c04c5e92a68
parent8ddc3e26e6534adc6f0cdc5c8b9e6ddc3fe3dd10 (diff)
parent0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb (diff)
downloadframeworks_base-b49748cfd3a4f87c394307787665c09521faa77d.zip
frameworks_base-b49748cfd3a4f87c394307787665c09521faa77d.tar.gz
frameworks_base-b49748cfd3a4f87c394307787665c09521faa77d.tar.bz2
am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
* commit '0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb': Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
-rw-r--r--core/java/android/app/UiAutomation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index b0dd70f..a8494fb 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -690,7 +690,7 @@ public final class UiAutomation {
* potentially undesirable actions such as calling 911 or posting on public forums etc.
*
* @param enable whether to run in a "monkey" mode or not. Default is not.
- * @see {@link android.app.ActivityManager#isUserAMonkey()}
+ * @see ActivityManager#isUserAMonkey()
*/
public void setRunAsMonkey(boolean enable) {
synchronized (mLock) {