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

Commit 5fd624c8 authored by Joe Fernandez's avatar Joe Fernandez Committed by android-build-merger
Browse files

am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added... 

am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs
automerge: 98b20e0a

* commit '98b20e0a':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
parents c6de6bb8 98b20e0a

docs/html/gms_navtree_data.js

+14 −24

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/reference/com/google/android/gms/R.attr.html

+1751 −188

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/reference/com/google/android/gms/R.color.html

+17 −13
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@
@@ -113,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=5" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -414,7 +412,6 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <li><a href="/distribute/users/index.html">Get Users</a></li>

                <li><a href="/distribute/engage/index.html">Engage &amp; Retain</a></li>

                <li><a href="/distribute/monetize/index.html">Monetize</a></li>

                <li><a href="/distribute/analyze/index.html">Analyze</a></li>

                <li><a href="/distribute/tools/index.html">Tools &amp; Reference</a></li>

                <li><a href="/distribute/stories/index.html">Developer Stories</a></li>

              </ul>
@@ -596,14 +593,14 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 




  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html" zh-cn-lang="应用内结算">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html" zh-cn-lang="应用内结算概述">

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html" zh-cn-lang="应用内结算 API">

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">
@@ -626,13 +623,13 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
      <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html" zh-cn-lang="安全性和设计">

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>

      </li>

      <li><a href="/google/play/billing/billing_testing.html" zh-cn-lang="测试应用内结算">

      <li><a href="/google/play/billing/billing_testing.html">

              <span class="en">Testing In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/billing_admin.html" zh-cn-lang="管理应用内结算">

      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/versions.html">
@@ -666,15 +663,22 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
              <span class="en">HTTP</span></a></li>

              </ul>

        </li>

        <li><a href="/google/gcm/server-ref.html">

            <span class="en">Server Reference</span></a>

        </li>

        <li><a href="/google/gcm/notifications.html">

              <span class="en">User Notifications</span></a>

        </li>

        <li><a href="/google/gcm/adv.html">

            <span class="en">Advanced Topics</span></a>

        </li>

        <li><a href="/google/gcm/c2dm.html">

            <span class="en">Migration</span></a>

        </li>

        <li id="gcm-tree-list" class="nav-section">

          <div class="nav-section-header">

            <a href="/reference/gcm-packages.html">

              <span class="en">Reference</span>

            </a>

          <div>

        </li>

      </ul>

  </li>

docs/html/reference/com/google/android/gms/R.drawable.html

+17 −13
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@
@@ -113,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=5" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -414,7 +412,6 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <li><a href="/distribute/users/index.html">Get Users</a></li>

                <li><a href="/distribute/engage/index.html">Engage &amp; Retain</a></li>

                <li><a href="/distribute/monetize/index.html">Monetize</a></li>

                <li><a href="/distribute/analyze/index.html">Analyze</a></li>

                <li><a href="/distribute/tools/index.html">Tools &amp; Reference</a></li>

                <li><a href="/distribute/stories/index.html">Developer Stories</a></li>

              </ul>
@@ -596,14 +593,14 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 




  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html" zh-cn-lang="应用内结算">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html" zh-cn-lang="应用内结算概述">

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html" zh-cn-lang="应用内结算 API">

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">
@@ -626,13 +623,13 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
      <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html" zh-cn-lang="安全性和设计">

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>

      </li>

      <li><a href="/google/play/billing/billing_testing.html" zh-cn-lang="测试应用内结算">

      <li><a href="/google/play/billing/billing_testing.html">

              <span class="en">Testing In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/billing_admin.html" zh-cn-lang="管理应用内结算">

      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/versions.html">
@@ -666,15 +663,22 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
              <span class="en">HTTP</span></a></li>

              </ul>

        </li>

        <li><a href="/google/gcm/server-ref.html">

            <span class="en">Server Reference</span></a>

        </li>

        <li><a href="/google/gcm/notifications.html">

              <span class="en">User Notifications</span></a>

        </li>

        <li><a href="/google/gcm/adv.html">

            <span class="en">Advanced Topics</span></a>

        </li>

        <li><a href="/google/gcm/c2dm.html">

            <span class="en">Migration</span></a>

        </li>

        <li id="gcm-tree-list" class="nav-section">

          <div class="nav-section-header">

            <a href="/reference/gcm-packages.html">

              <span class="en">Reference</span>

            </a>

          <div>

        </li>

      </ul>

  </li>

docs/html/reference/com/google/android/gms/R.html

+17 −13
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@
@@ -113,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=5" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -414,7 +412,6 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <li><a href="/distribute/users/index.html">Get Users</a></li>

                <li><a href="/distribute/engage/index.html">Engage &amp; Retain</a></li>

                <li><a href="/distribute/monetize/index.html">Monetize</a></li>

                <li><a href="/distribute/analyze/index.html">Analyze</a></li>

                <li><a href="/distribute/tools/index.html">Tools &amp; Reference</a></li>

                <li><a href="/distribute/stories/index.html">Developer Stories</a></li>

              </ul>
@@ -596,14 +593,14 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 




  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html" zh-cn-lang="应用内结算">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html" zh-cn-lang="应用内结算概述">

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html" zh-cn-lang="应用内结算 API">

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">
@@ -626,13 +623,13 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
      <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html" zh-cn-lang="安全性和设计">

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>

      </li>

      <li><a href="/google/play/billing/billing_testing.html" zh-cn-lang="测试应用内结算">

      <li><a href="/google/play/billing/billing_testing.html">

              <span class="en">Testing In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/billing_admin.html" zh-cn-lang="管理应用内结算">

      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

      <li><a href="/google/play/billing/versions.html">
@@ -666,15 +663,22 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
              <span class="en">HTTP</span></a></li>

              </ul>

        </li>

        <li><a href="/google/gcm/server-ref.html">

            <span class="en">Server Reference</span></a>

        </li>

        <li><a href="/google/gcm/notifications.html">

              <span class="en">User Notifications</span></a>

        </li>

        <li><a href="/google/gcm/adv.html">

            <span class="en">Advanced Topics</span></a>

        </li>

        <li><a href="/google/gcm/c2dm.html">

            <span class="en">Migration</span></a>

        </li>

        <li id="gcm-tree-list" class="nav-section">

          <div class="nav-section-header">

            <a href="/reference/gcm-packages.html">

              <span class="en">Reference</span>

            </a>

          <div>

        </li>

      </ul>

  </li>