Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1cdf279 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo

Merge commit '89f74cf6' into kraken

* commit '89f74cf6':
  Doc change: update diff report 7-> 8
parents 812266dd 89f74cf6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
<meta name="generator" content="JDiff v1.1.0">
<!-- Generated by the JDiff Javadoc doclet -->
<!-- (http://www.jdiff.org) -->
<!-- on Fri May 07 16:29:16 PDT 2010 -->
<!-- on Tue May 11 19:22:44 PDT 2010 -->
<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
<TITLE>
+0 −6
Original line number Diff line number Diff line
@@ -1523,9 +1523,6 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style=
<A HREF="pkg_android.os.html#RecoverySystem" class="hiddenlink" target="rightframe"><b>RecoverySystem</b></A><br>
<!-- Class RecoverySystem.ProgressListener -->
<A HREF="pkg_android.os.html#RecoverySystem.ProgressListener" class="hiddenlink" target="rightframe"><b><i>RecoverySystem.ProgressListener</i></b></A><br>
<!-- Method registerAudioFocusListener -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.registerAudioFocusListener_added(android.media.AudioManager.OnAudioFocusChangeListener)" class="hiddenlink" target="rightframe"><b>registerAudioFocusListener</b>
(<code>OnAudioFocusChangeListener</code>)</A></nobr><br>
<!-- Method registerMediaButtonEventReceiver -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.registerMediaButtonEventReceiver_added(android.content.ComponentName)" class="hiddenlink" target="rightframe"><b>registerMediaButtonEventReceiver</b>
(<code>ComponentName</code>)</A></nobr><br>
@@ -1951,9 +1948,6 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style=
<!-- Field UNKNOWN_STRING -->
<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.UNKNOWN_STRING" class="hiddenlink" target="rightframe">UNKNOWN_STRING</A>
</nobr><br>
<!-- Method unregisterAudioFocusListener -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.unregisterAudioFocusListener_added(android.media.AudioManager.OnAudioFocusChangeListener)" class="hiddenlink" target="rightframe"><b>unregisterAudioFocusListener</b>
(<code>OnAudioFocusChangeListener</code>)</A></nobr><br>
<!-- Method unregisterMediaButtonEventReceiver -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.unregisterMediaButtonEventReceiver_added(android.content.ComponentName)" class="hiddenlink" target="rightframe"><b>unregisterMediaButtonEventReceiver</b>
(<code>ComponentName</code>)</A></nobr><br>
+0 −6
Original line number Diff line number Diff line
@@ -2062,9 +2062,6 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style=
<A HREF="pkg_android.os.html#RecoverySystem" class="hiddenlink" target="rightframe"><b>RecoverySystem</b></A><br>
<!-- Class RecoverySystem.ProgressListener -->
<A HREF="pkg_android.os.html#RecoverySystem.ProgressListener" class="hiddenlink" target="rightframe"><b><i>RecoverySystem.ProgressListener</i></b></A><br>
<!-- Method registerAudioFocusListener -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.registerAudioFocusListener_added(android.media.AudioManager.OnAudioFocusChangeListener)" class="hiddenlink" target="rightframe"><b>registerAudioFocusListener</b>
(<code>OnAudioFocusChangeListener</code>)</A></nobr><br>
<!-- Method registerMediaButtonEventReceiver -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.registerMediaButtonEventReceiver_added(android.content.ComponentName)" class="hiddenlink" target="rightframe"><b>registerMediaButtonEventReceiver</b>
(<code>ComponentName</code>)</A></nobr><br>
@@ -2571,9 +2568,6 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style=
<!-- Field UNKNOWN_STRING -->
<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.UNKNOWN_STRING" class="hiddenlink" target="rightframe">UNKNOWN_STRING</A>
</nobr><br>
<!-- Method unregisterAudioFocusListener -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.unregisterAudioFocusListener_added(android.media.AudioManager.OnAudioFocusChangeListener)" class="hiddenlink" target="rightframe"><b>unregisterAudioFocusListener</b>
(<code>OnAudioFocusChangeListener</code>)</A></nobr><br>
<!-- Method unregisterMediaButtonEventReceiver -->
<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.unregisterMediaButtonEventReceiver_added(android.content.ComponentName)" class="hiddenlink" target="rightframe"><b>unregisterMediaButtonEventReceiver</b>
(<code>ComponentName</code>)</A></nobr><br>
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ body{overflow:auto;}
      </tr>
      <tr>
        <td class="diffspec">Generated</td>
        <td class="diffvalue">2010.05.07 16:29</td>
        <td class="diffvalue">2010.05.11 19:22</td>
      </tr>
    </table>
    </div><!-- End and-diff-id -->
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ body{overflow:auto;}
      </tr>
      <tr>
        <td class="diffspec">Generated</td>
        <td class="diffvalue">2010.05.07 16:29</td>
        <td class="diffvalue">2010.05.11 19:22</td>
      </tr>
    </table>
    </div><!-- End and-diff-id -->
Loading