am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev

* commit '3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e':
  Unhide MediaExtractor.getPsshInfo()

1 files changed, 2 insertions, 2 deletions

diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index cf159f0..e558c07 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -199,9 +199,9 @@ final public class MediaExtractor {
     public native final int getTrackCount();
 
     /**
-     * Get the PSSH info if present. This returns a map of uuid-to-bytes, with the uuid specifying
+     * Get the PSSH info if present.
+     * @return a map of uuid-to-bytes, with the uuid specifying
      * the crypto scheme, and the bytes being the data specific to that scheme.
-     * {@hide}
      */
     public Map<UUID, byte[]> getPsshInfo() {
         Map<UUID, byte[]> psshMap = null;