summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-05-07 17:26:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-07 17:26:59 +0000
commit11da8a8aee1bb0b72c06a62db4e976bf578e6695 (patch)
tree67960e82955530a71a652e8caead0e7a4ea0532d
parent153187d05bb82aec54967ece1917db325b70d7ad (diff)
parent007bbc0ed332a5fb40fbca294870adf854c200dd (diff)
downloadframeworks_base-11da8a8aee1bb0b72c06a62db4e976bf578e6695.zip
frameworks_base-11da8a8aee1bb0b72c06a62db4e976bf578e6695.tar.gz
frameworks_base-11da8a8aee1bb0b72c06a62db4e976bf578e6695.tar.bz2
Merge "Fix javadoc typo"
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index b24b932..209c536 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2069,7 +2069,7 @@ public class DevicePolicyManager {
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param intent An intent matching the app(s) to be installed. All apps that resolve for this
* intent will be re-enabled in the current profile.
- * @returns int The number of activities that matched the intent and were installed.
+ * @return int The number of activities that matched the intent and were installed.
*/
public int enableSystemApp(ComponentName admin, Intent intent) {
if (mService != null) {