diff options
| author | Scott Main <smain@google.com> | 2013-11-05 15:28:56 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2013-11-05 15:28:56 -0800 |
| commit | 16560f1e146c854bb006e22601dbcf6eac798167 (patch) | |
| tree | 60bfd7a2007a3456224711c86694c61dbbd4ca39 | |
| parent | b4a601467cf0aecbcb25ed166d9a432783252216 (diff) | |
| parent | fae59e8ae129ec41faed029cfa09df8856b7d21c (diff) | |
| download | android_development-16560f1e146c854bb006e22601dbcf6eac798167.tar.gz android_development-16560f1e146c854bb006e22601dbcf6eac798167.tar.bz2 android_development-16560f1e146c854bb006e22601dbcf6eac798167.zip | |
resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c
| -rw-r--r-- | samples/browseable/ActivityInstrumentation/_index.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/browseable/ActivityInstrumentation/_index.jd b/samples/browseable/ActivityInstrumentation/_index.jd index a29a445cc..369ff7eb6 100644 --- a/samples/browseable/ActivityInstrumentation/_index.jd +++ b/samples/browseable/ActivityInstrumentation/_index.jd @@ -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> |