diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-10-12 14:18:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 14:18:33 -0700 |
| commit | d555e2643f2bdc8b7e6096ce40943fcc56ec22d2 (patch) | |
| tree | 910334b1129b8902e37065876f894c5eb3f2bf7f /docs/html/images | |
| parent | 7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef (diff) | |
| parent | 354954a01c533c6789536c141cf330ddf3976e8b (diff) | |
| download | frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.zip frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.tar.gz frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.tar.bz2 | |
am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Diffstat (limited to 'docs/html/images')
| -rwxr-xr-x | docs/html/images/testing/android_test_framework.png | bin | 82419 -> 47368 bytes |
| -rw-r--r-- | docs/html/images/testing/eclipse_test_results.png | bin | 0 -> 24260 bytes |
| -rw-r--r-- | docs/html/images/testing/eclipse_test_run_failure.png | bin | 0 -> 49342 bytes |
| -rw-r--r-- | docs/html/images/testing/test_framework.png | bin | 0 -> 43397 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/images/testing/android_test_framework.png b/docs/html/images/testing/android_test_framework.png Binary files differindex 6f80530..459975c 100755 --- a/docs/html/images/testing/android_test_framework.png +++ b/docs/html/images/testing/android_test_framework.png diff --git a/docs/html/images/testing/eclipse_test_results.png b/docs/html/images/testing/eclipse_test_results.png Binary files differnew file mode 100644 index 0000000..105e149 --- /dev/null +++ b/docs/html/images/testing/eclipse_test_results.png diff --git a/docs/html/images/testing/eclipse_test_run_failure.png b/docs/html/images/testing/eclipse_test_run_failure.png Binary files differnew file mode 100644 index 0000000..8111127 --- /dev/null +++ b/docs/html/images/testing/eclipse_test_run_failure.png diff --git a/docs/html/images/testing/test_framework.png b/docs/html/images/testing/test_framework.png Binary files differnew file mode 100644 index 0000000..fbc5fc2 --- /dev/null +++ b/docs/html/images/testing/test_framework.png |
