diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-05-07 17:30:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 17:30:04 +0000 |
| commit | fbad7705ba8e5495f5ca03bdd061a43a079002bc (patch) | |
| tree | 9b0e571b392d7b3f7cd670ede0714c78bff85f1e /core | |
| parent | d2b5fdcd895ab9144e933b9c7d3e3200123ba536 (diff) | |
| parent | 11da8a8aee1bb0b72c06a62db4e976bf578e6695 (diff) | |
| download | frameworks_base-fbad7705ba8e5495f5ca03bdd061a43a079002bc.zip frameworks_base-fbad7705ba8e5495f5ca03bdd061a43a079002bc.tar.gz frameworks_base-fbad7705ba8e5495f5ca03bdd061a43a079002bc.tar.bz2 | |
am 0e5d4e4a: Merge "Fix javadoc typo"
* commit '0e5d4e4ae4e7c51f383eb1ef2e3941dcdd8096aa':
Fix javadoc typo
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
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) { |