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

resolved conflicts for merge of 1d38e9a1 to klp-ub-dev

Browse Source 
Change-Id: I4f74db2ae175c2405aacece146244928f436551c
This commit is contained in:
Scott Main
2013-11-05 13:15:10 -08:00
parent d7f2d1ca07 1d38e9a13e
commit fae59e8ae1
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 <p>This sample demonstrates how to use an
{@link android.test.InstrumentationTestCase} to test the internal state of an {@link android.test.InstrumentationTestCase} to test the internal state of an
{@link android.app.Activity}.</p> {@link android.app.Activity}.</p>
<p>To learn more about using Android's custom testing framework, see <p>To learn more about using Android's custom testing framework, see
<a href="{@docRoot}training/activity-testing/index.html">Testing Your <a href="{@docRoot}training/activity-testing/index.html">Testing Your
Android Activity</a>.</p> Android Activity</a>.</p>