commit 18eda4a1caba579962c54c6a8ca8ba08e2430c40
author Sungsoo Lim <sungsoo@google.com> Mon Feb 29 05:19:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 29 05:19:53 2016 +0000
tree ba67c1c23cd2c61464e20b68259e27bc7289e990
parent 1e41dcd1d269637968e80e51946c95e9bf0ded6d
parent ab19dc8e14cbf55342d97d8f0355b3082502ee4b

Merge "MediaBrowser: Fix Javadoc" into nyc-dev

media/java/android/media/browse/MediaBrowser.java

diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index 2f72df6..9e67c15 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -73,7 +73,6 @@
      * Used as an int extra field to denote the page number to subscribe.
      * The value of {@code EXTRA_PAGE} should be greater than or equal to 1.
      *
-     * @see android.service.media.MediaBrowserService.BrowserRoot
      * @see #EXTRA_PAGE_SIZE
      */
     public static final String EXTRA_PAGE = "android.media.browse.extra.PAGE";
@@ -82,7 +81,6 @@
      * Used as an int extra field to denote the number of media items in a page.
      * The value of {@code EXTRA_PAGE_SIZE} should be greater than or equal to 1.
      *
-     * @see android.service.media.MediaBrowserService.BrowserRoot
      * @see #EXTRA_PAGE
      */
     public static final String EXTRA_PAGE_SIZE = "android.media.browse.extra.PAGE_SIZE";
@@ -860,7 +858,7 @@
          *
          * @param parentId The media id of the parent media item.
          * @param children The children which were loaded, or null if the id is invalid.
-         * @param options A bundle of service-specific arguments to send to the media
+         * @param options A bundle of service-specific arguments sent to the media
          *            browse service. The contents of this bundle may affect the
          *            information returned when browsing.
          */