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

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

am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls... 

am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev

# Via Android (Google) Code Review (1) and others
* commit '120f7eb5':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
parents 7d47fbf3 120f7eb5

docs/html/sdk/api_diff/10/changes/alldiffs_index_additions.html

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style= 
<A HREF="pkg_android.nfc.html#Tag" class="hiddenlink" target="rightframe"><b>Tag</b></A><br>

<!-- Class TagLostException -->

<A HREF="pkg_android.nfc.html#TagLostException" class="hiddenlink" target="rightframe"><b>TagLostException</b></A><br>

<script src="http://www.google-analytics.com/ga.js" type="text/javascript">

<script src="//www.google-analytics.com/ga.js" type="text/javascript">

</script>

<script type="text/javascript">

  try {

docs/html/sdk/api_diff/10/changes/alldiffs_index_all.html

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style= 
<A HREF="pkg_android.nfc.html#Tag" class="hiddenlink" target="rightframe"><b>Tag</b></A><br>

<!-- Class TagLostException -->

<A HREF="pkg_android.nfc.html#TagLostException" class="hiddenlink" target="rightframe"><b>TagLostException</b></A><br>

<script src="http://www.google-analytics.com/ga.js" type="text/javascript">

<script src="//www.google-analytics.com/ga.js" type="text/javascript">

</script>

<script type="text/javascript">

  try {

docs/html/sdk/api_diff/10/changes/alldiffs_index_changes.html

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style= 
 <a href="#topheader"><font size="-2">TOP</font></a>

<p><div style="line-height:1.5em;color:black">

<A HREF="android.nfc.NfcAdapter.html" class="hiddenlink" target="rightframe">NfcAdapter</A><br>

<script src="http://www.google-analytics.com/ga.js" type="text/javascript">

<script src="//www.google-analytics.com/ga.js" type="text/javascript">

</script>

<script type="text/javascript">

  try {

docs/html/sdk/api_diff/10/changes/alldiffs_index_removals.html

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ Listed as: <span style="color:#069"><strong>Added</strong></span>, <span style= 
<p><div style="line-height:1.5em;color:black">

<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.setPackageObbPath_removed(java.lang.String, java.lang.String)" class="hiddenlink" target="rightframe"><strike>setPackageObbPath</strike>

(<code>String, String</code>)</A></nobr><br>

<script src="http://www.google-analytics.com/ga.js" type="text/javascript">

<script src="//www.google-analytics.com/ga.js" type="text/javascript">

</script>

<script type="text/javascript">

  try {

docs/html/sdk/api_diff/10/changes/android.bluetooth.BluetoothAdapter.html

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ Class android.bluetooth.<A HREF="../../../../reference/android/bluetooth/Bluetoo 
    </div> <!-- end footer -->

    </div><!-- end doc-content -->

    </div> <!-- end body-content --> 

<script src="http://www.google-analytics.com/ga.js" type="text/javascript">

<script src="//www.google-analytics.com/ga.js" type="text/javascript">

</script>

<script type="text/javascript">

  try {