LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp

Browse Source 
* commit '16560f1e146c854bb006e22601dbcf6eac798167':
This commit is contained in:
Scott Main
2013-11-05 15:35:13 -08:00
committed by Android Git Automerger
parent a870f691ab 16560f1e14
commit b6a83cef3d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/browseable/ActivityInstrumentation/_index.jd
View File

@@ -8,6 +8,6 @@ sample.group=Testing
<p>This sample demonstrates how to use an
{@link android.test.InstrumentationTestCase} to test the internal state of an
{@link android.app.Activity}.</p>
<p>To learn more about using Android's custom testing framework, see
<a href="{@docRoot}training/activity-testing/index.html">Testing Your
<p>To learn more about using Android's custom testing framework, see
<a href="{@docRoot}training/activity-testing/index.html">Testing Your
Android Activity</a>.</p>