am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

* commit 'baf4a057f8d4b5a97a5b3da276b59c2cd175e4b7':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)

media/java/android/media/MediaPlayer.java

@@ -1181,7 +1181,8 @@ public class MediaPlayer
     /**
      * Gets the duration of the file.
      *
-     * @return the duration in milliseconds
+     * @return the duration in milliseconds, if no duration is available
+     *         (for example, if streaming live content), -1 is returned.
      */
     public native int getDuration();