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

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

Browse Source 
* commit 'b6a83cef3dde89c0617d9395368dce48e582497e':
This commit is contained in:
Scott Main
2014-01-09 21:36:09 +00:00
committed by Android Git Automerger
parent aec7112c40 b6a83cef3d
commit f6e5dd3eee
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>