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

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

am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing... 

am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo

Merge commit 'e4682e8a' into kraken

* commit 'e4682e8a':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
parents 25d24061 e4682e8a

docs/html/guide/guide_toc.cs

+40 −39
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ 
            <li><a href="<?cs var:toroot?>guide/topics/search/searchable-config.html">Searchable Configuration</a></li>

          </ul>

      </li>

      <li><a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">

            <span class="en">Testing and Instrumentation</span></a>

            <span class="new">new!</span></li>

    </ul>

  </li>
@@ -297,8 +300,6 @@ 
              <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li>

          </ul>

        </li>

  <!--<li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li>

      <li><a style="color:gray;">JUnit</a></li> -->

    </ul>

  </li>

docs/html/guide/topics/testing/testing_android.jd

0 → 100755
+494 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/images/testing/android_test_framework.png

0 → 100755
+80.5 KiB
Loading image diff...